I would say pressure test the block and make sure there are no other leaks. Then have him weld the header and head for the water. If that cured the problem take the smokin deal on the new headers.
This is my guess and I would try it. Then you can spend the rest of your money on diapers. BTW congrats on the soon to be kid.