Though the Headgasket always sounds like a big issue, where you're at now, it wont be much more work at all to change it out. You're pretty much going to have to do part of what you did now to change it later. Let me know if you need a walkthrough for that too. And yes...sometimes you learn about that water pump the hard way like ya did...Haha