I'm sort of in a similar boat as you OP (although I'm not having any real trouble with my stock wheels) and posted a similar thread about wheel upgrades recently. Lots of good suggestions came from it so check it out :
http://www.bikeforums.net/showthread...on!?highlight=
(I haven't yet decided if I am going to upgrade mine or not... still contemplating
)