It took me three tries to get it right. Your best looking option would be to replace the entire firewall with one solid smooth piece.
This was not perfect, just making patches and trying to smooth them in. Of course a genius body man could probably do a better job.
I finally cut out all that crap and welded in one piece. Here is the result.