What does it matter? There's only going to be six FJ squadrons (per AVM Bagwell), so their identities are really by-the-by. May as well call them 801-806 Naval Air Squadrons, and put the other few ISTAR, AT & SH squadrons in the Army and have done with it.
Even as an ex-soldier, it gives me no pleasure to point this out, but really, what's the point of it all? The viability of the RAF as a stand alone force is rapidly diminishing, and the headshed doesn't seem to be able to do anything about it.