The crazy thing is that it's already had a gearbox rebuild at some point! I guess it must have been out of warranty so when it started having problems again they just bailed on it rather than investigating.
This is my hit list prior to MoT on Tuesday:
Not on the list is 'remove swimming pool from driver's side carpet' and valet the interior so it doesn't smell of old socks