FWIW I swapped a 6M-GE from my 84 Mk2 into my other 84 Mk2 last year when I cooked the 5M-GE. I did exactly as suggested above, ie swapped the long motor and left everything else alone. I had most of it done in a single afternoon, it really is quite easy! 
