Thinking about it, you may be able to create a custom modifier in your CAD software that would overlap your entire model at just the right points to get the wall back where you want it.
Proof of concept:
1 Like