We do have a machine polisher at home, I'll have a look into that.
Mentalpen - True, this is only my second car (coming from a 6n2 polo) so I'm new to the detailing aspect. I'm used to a two bucket wash and thats about as far as I've ventured.
I'd be going for option 2 there, I can't justify...