Use an epoxy primer if you can. It will take the CaCl a long time to eat through that should you have a leak.
As far as new wheels go, I'd buy NewHolland original. I've had aftermarket from A&I and will never again buy them. They can't seem to make them round... so fitting the centers is a nightmare.