I've read here that wheels are the single most effective upgrade to your bike so if the frame fits you otherwise, and a good bike fit at the shop shows 650 wheels will fit you better....go for it. You'll have room for your Luna bars and with lighter, faster, more aerodynamic wheels you reduce rotational weight that you gotta get going from a dead stop. Stiffer wheels feel "rounder" to me, much less rolling resistance. Not sure aerodynamic makes much difference at my speed but WTF, I LOOK faster, that counts for something.

Even having the wheels trued makes a huge difference in speed on the bike if that's not been done.