Hm, i was about the same experience as you when i changed my first water pump, it was on a much less complicated beast (chevy pickup) but still a long job.

What i learned from the experience was :
Drain the antifreeze beforehand and There's a gasket that goes between the waterpump and the engine.