Finally got the old broken bolts out and new ones installed and re riveted back. Now I will clean everything very good and do some more polishing and painting before final re assembly. I can se the finish line and though it won't be perfect I glad I tackled it and didn't just leave it as is.