Drivers window regulator replacement

Hi guys, I need to change the drivers electric window regulator on my '56 Elegance. Is there any difference in the Mk2/Mk2f regulators? Seems an abundance of facelift ones available but mine is pre fl.

Also, is an M6 washer suitable for reriveting the door panel back? From what I've read the rivets used on the panel are bigger than what's easily available and a 5mm rivet is the better option with a washer taped/glued on the inside of the door?