Having done a fair bit with after market wheels,it's the front one you need to make the difference although I realise that doesn't solve the tube problem with the rear,I've been meaning to do some digging into the various options but I know it'll cost me a fortune!!
http://www.alpina-uk.com/