I have often thought it would be better to allocate the numbers to (flying) flights. Then tradition and memorabilia etc could be held at sub-unit level, just as the RA keep tradition at Batteries rather than Regiments.
So a current "Squadron" would become a Wing - commanded by a wg cdr! - and would comprise 2 or 3 (or more) numbered Sqns.
As an example, a "Puma Wing" could comprise 33, 230 and 78, with perhaps an additional one (with or without (R)) for the OCF.
And for Old-Duffer's "Bogs and Drains", maybe the motto of 617 - if not the badge - would be entirely appropriate!
I see no snags ........ and think of all the Standards at Dining-In Nights!