Fairly mechanically adept... how straightforward is it to do the belts and water pump exactly?

If you have all the correct tools, and locking devices then you can, but make sure you know what else you have to change apart from the belts and use good quality parts.

Somebody who knows more about the 1.8T should be able to help you more than me.