Went to the big box stores, neither one (Autozone and O'Reilly's) carried it as a rental. Found a second hand one on CL this morning and was able to tap them out. The block is ready for the machine shop, it only had one broken stud which I was able to drill out. I did hit the threads slightly but I think its ok. I'll mock up the water pump and torque to spec, if it holds I'm good, if not, the machine shop will have to fix it (LOL).
I've got the head stripped down but its got two broken bolts, both are at the exhaust manifold. Should be loads of fun. :roll: