Looks good Iain. I must admit, I'm starting to look at MK6 GTI's and R's now as well. There are 3/4 at my local dealers in Aberdeen and a ED35 has also just come in there. Was up having a look yesterday and will need to look at numbers before deciding. Like you, I seem to have a consistent stream of minor niggles cropping up due to the cars age. I do love the MK5 though.
Good luck keeping it clean - mine is also DBP and it looks great shiny, but only has to look at the road and it's filthy again!!