I'd get new rims and have the peace of mind of one less thing to worry about.

As for switching to discs, is your bike set up for discs? If so, and if you have the money to do it, I would do that in a heartbeat.
I am planning on getting a new touring bike with discs this year, to replace my old bike that has canti's.