How to align electrical boxes/plugs?
Turn off the power at the breaker
Rip the wall open
Pull out the devices from the boxes and label the wires of the devices
Remove the devices
Unclamp the cables and pull them back
Pry off the boxes
Place new boxes
Insert and clamp the cables
Repair the wall
Replace the devices following the labels applied earlier
Turn breaker on and verify correct operation
Install cover plates

Note that a small drywall repair is typically at least as much work, if not more work, than a large drywall repair - A sheet is 4x8 feet, so feel free to go (up to) that large if it simplifies your re-wiring at all.