Based on what you wrote, I'd just skip right over "upgrading" your wheels and just ride more. Spend the money on some cycling vacation or something. Maybe get some better tires for your existing wheels. People get far too breathy about upgrades around here.