Keep it as it is. Y+C pay a premium, and this should show in points earning.

Incentives for flying after raching elite status
Very good idea. Perhaps a bit generous, but this is definately something lacking in todays program.