Man-on-the-Fence. Apologies, you are right. Got confused - it was the Mk XIX Spit that was fitted with the Shack Griffin.
Research shows - the early Spitfires, the Mark IIa and Mark V have 30 series Merlins and the Hurricanes, Spitfire IX and Lancaster have Merlin 500s. The Mark XIX Spitfires have Griffon 58s, formerly fitted to Shackeltons, which have had the contra rotating prop gearbox replaced.