Managed to sneak out of work for a couple of hours to get this done today, paid the expensive but good place to do it as I don't trust the local garages to get something like this right. £48 for to have tyre removed, rims cleaned up, new valve and balancing for 2 wheels, I don't really mind that as they did take an hour to get it right. Tyre fitter said that the rims just had mild corrosion, so hopefully sorted.