this should sort the boot leak, my mk4 also has this, the boot stinks. I'll be doing the same thing at some point.
There is guy called dan Merrin in derby/Notts who does wheel refurbs, more expensive than local shops, but he guarantees them for three years not one.