Regarding your g/box shunt/chatter noise, after a couple of thousand more miles, get the dual mass flywheel checked. Mine had to be replaced by the factory at 12k miles - all seems ok now, chatter is now a whisper.
Sorry, I think that was afr's problem, hope its not yours too!!!!
Lol, I have that 'problem' too - for me, not really a mechanical problem, more of a driver problem

I guess I will just have to exercise patience when filling the water bottle (not one of my strong points!!)