Bill is correct and if you check back - I initially suggested the cheapest most effective upgrade would be to just service the bearings on your current wheels and get some great tires. Getting them retensioned at the same timme makes sense.

I mentioned that the wheels you originally picked out were overkill simply because they're designed to handle far more abuse than your riding style will give them. So - nice wheels - but why pay for three times more than you need?