Heh, we seem to be of a similar mind. To me the F30 looks superb and I was quite set on getting one. These issues are giving me some doubts now however and may push back in the direction of another GTI.
I have to say I really like the look of the mk7.
What are you planning to do your mk 6 are you running it alongside your new car?