Where to from here? Hanger progression advice request

I'm trying to figure out what to develope next. I'm currently also working on a 6/8 all meds roster as well, but mostly as a time sink for whenever I need to build up silver levels. I took a break from the game and came back around Halloween- a lot of my hanger is based on the old matchmaker from 6 months ago adapted to the MM update- since you only get hit by the britbot/WSPbot penalty once I went whole hog.
This is where I'm currently at:



In addition to this, I've got a horde of boas at varying levels, another Rog, a l5 Rhino, a l2 Gep (used with Piñatas back in the old matchmaker days, I promise) and a bunch of other silver purchased nonsense.
In terms of my armory, I've got a l6 Orkan, a pair of l9 Tarans, a pair of l8 Mags, a l8 Aphid and a large assortment of Piñatas, CRVs and Tulus of varying levels, mostly around the l8 range (although the Piñatas stretch up to 11).

I'm sitting on 17k WSP and 7k gold.


So, what's the logical step forward? I know the Rog will have to get left behind, and was thinking of by running CRV Patton, 2x Boa, 2x Rog as my B team- I'd just stick to ~6/8 for the bots at them, but I'm not sure what the organic development of my primary roster should be.

edit: clarified title.