Hi Spiros,
From the illustration in the S6 parts book, the magneto on Michael's bike looks to be correct except that it should have straight HT pickups (the leads emerge perpendicular to the side of the mag). I have also checked the model number on my S6 mag and it is Type M2 - AE2. By the way - the magneto does not mount directly onto the crankcase, but sits on 4 buttons with .20" deep heads - this allows air to circulate under the mag and reduce the risk of overheating.
Regards,
Eddie.