This is from memory but for "six speed" spacing, from the land the freewheel tightens against on the hub to the locknut parallel to the axle centerline should be 36.5mm

Assuming no washer behind the freewheel here.

I think you are going to need all of that mentioned 2mm. and yes, I would correct the dish after it shifts well.