Thanks, that'll save some work.
I already have a short shaft water pump so am prepared for that. I've read the info in the tech section; I'll have a look through the posts.