Ouch! Just looking at your pics makes me think "that must have hurt!"
Anyway, I wanted to suggest replacing the mounting nuts and bolts while you are doing this repair.
Velo Orange sells an updated version using hex nuts and bolts but they appear to be out of stock at the moment.

These really work well. Best of luck on your repair.