Stop using WD-40. It attracts dirt.
Clean the rims real good. Then use a
light spray wax/cleaner. It helps repel brake dust and some road grime. Helps dirt to be easily removed.
When you do regular chain maintenance, check your tire pressure/condition also clean the rim/wheels/brake calipers.
My rims look almost as good as new. They've got a few minor nicks and scratches from normal wear.
See this thread for more info.
https://www.ninjette.org/forums/show...ust#post302256