I understand what you are saying but I have to look at this way, do I want to be cutting, drilling and possibly damaging a $5k paint job to make everything fit? No
I would rather figure everything out now and then pull it apart to paint it, then bolt everything back together, less chance of damaging the paint job afterwards.
It will be a lot of work but it will be worth it, doesn't mean that I may not still hurt something but it should be minor at that time.