After much searching on the forum I finally found out what kind of Safari Snorkel I needed for my Gen 2 3L Auto. After much more phoning around I finally found somewhere in the UK that could supply it...with a 3 month wait.

Then during all this someone started selling snorkels on Ebay...