I love every person out there who has stuck with his R1 and hasn't jumped ship to the newest platform as tempting as it may be. So yes, if you love her go for it. I have a 14B and plan on modding the hell out of it until it becomes the best it can be.
Aftermarket wheels are usually the best bang for the buck mod as you improve every aspect of the bike, i.e. lighter wheels means the bike will handle better, accelerate faster, brake better and of course look better. I think the best bet is the Marchesini Genesi (7 spoke) or Kompe (10 spokes), I think the Genesi is lighter though. OZ is another great option.