@Chris Dreyer really, all you need to do is use Collections in exactly the same way you're currently using Teams. It's a bit of a foible of Trello that people typically use teams to achieve what Collections does, because it makes the pathway to upgrading a little weird.
Using a naming convention can make it easier to see groups of boards in the boards menu without a mouse, for example hitting the "b" key to bring up the board menu then typing "ops" should show you the ops boards. The board menu filter is always on board name rather than collection name iirc.