DO THE WATER PUMP. No ands ifs or buts. It is right there beind the timing belt. They are only like 50 bucks +/- You'd be pissed when u put it all back together and it starts leaking. And timing belt. Yes, it may be a little bit more money but it'll save you time in the end.
Mota-Loving it a lot. It has one problem with the seat belt, but so far so good. I like I can go around corners like a sports car.
-Ant.