Generally cabins 1,3,5 have gotten hit across the RCN command platforms on both coasts (or most? FG is always calling, and I can't remember seeing an original Cabin 1/3/5 lately). In every frigate I've seen, 4 is still intact as the most spacious 2-person cabin. That said, every ship seems to pick up their own layouts.
Back in the mid-2010s Charlottetown received an EC for a 9-person Cabin 6/8, which was as shitty as you'd expect. I'm not sure if that EC made it to any other ships (or if that setup is still a thing). Fredericton had an abomination of a combined 7/8 Mess, which I think has been reverted because it was gross and a giant death trap in case of a fire.
The cabin assignment of Fleet Staff is usually a bit of a wildcard, generally driven by how many female bunks they require.