You'll need to remove 5mm of spacing on the NDS. (Actually, I'd remove about 3mm and force the DO's 2mm)
IF QR, you need to cut off 5mm off the axle so the ends don't protrude beyond the DO's.
You'll need to redish. This is actually simple. Just loosen the NDS spokes slightly. Probably 1/4 turn or so. Do 1/8T at a time and check.
Check dish first. It might already have moved a mm or 2 toward that side.
The NDS spokes have a much greater effect on dish then DS.