I'm almost the same size and weight as the op and he doesn't need 36 spoke wheels. I ride as much as 10k miles a year and all my wheels are 32 spoke or less. The most important thing is to have whatever wheels you get trued and tensioned properly.

Personlly, I'd take those stock wheels in, now that you have a couple months on them, and have them retensioned properly (not trued). Take care of them and they'll probably last you much longer than you think and save you a few bucks. If you are looking at a good sensible trainer or daily wheel the 32 spoke Deep V's are hard to beat. If you want a nice set of boutique wheels for special rides don't be afraid of them. I would go for an aero wheel over light weight. The deep dish will add strength to the wheel. Something with a 45mm+/- rim like a Zipp 404, ENVE or HED would be awesome on your CAAD 9.