Steve,
Sorry to hear about your engine builder. Tom Lucas at FE Specialties would be my first choice. He is excellent. His shop is in North Sac right off of I80. I would be happy to speak with you as a satisfied customer any time.
www.fespecialties.com
Good luck, John