I'm 99.9% certain that the 6 Sqn badge is the original, PN - and that it has always been the official badge. The Flying Canopener marking is unofficial/semi-official, in the same way that 112 Sqn's shark mouth had nothing to do with its badge (of a Helwan Cat) and 50 Sqn's running dingoes emblem had nothing to do with the actual squadron badge ('Dingo' being an early R/T call sign for 50 Sqn AIUI).