Canadian Armed Forces - RCAF

[cga00]

I have a small collection of RCAF hat badges and have recently acquired a gold lurex type thread on dark green felt hat badge which I'm told was worn by females (tri service, up to officer rank I'm guessing).

I also have a RCAF officers beret badge, almost identical to the badge worn now, but on a similar dark green background.

Can someone please tell me - Am I correct in thinking that air force officers, during the period of unification, wore the crown/eagle/wreath on a dark green background on all headgear?

I'm also looking for a pair of collar badges for the air force, as worn with the metal Canadian Armed Forces hat badge - If anybody has a spare pair.
Many thanks, Craig