Honestly I can understand some of your gripes with gensec. I know we're not the closest (though we're far from strangers lol), but you have a presence about you that can be felt when you're around. Being an SM myself I understand being SM limits a specific path of progression for a time.
Looking at your reasons however, I would like to bring up the Wardens. I know you're probably sick of hearing it mentioned occasionally but it has my recommendation. It gives a new goal and you don't have to worry about constantly calling out crossfire and being glued to a barricade for minutes on end. Since it's a security sub-branch too you don't need to worry about it taking up a life. Also since wardens are more selective, there's definitely more discipline as well. When I get bored of D-block I can just hop on wardens and roam LCZ and mix things up. I'm fine whatever you choose, I just want you know know the options there.
(This is my first forum post disregarding roll call so sorry if talking about branches/sub-branches is something people don't normally do. I'm not normally a forum person lol)
Regardless of what your final choice is, I genuinely hope you have fun wherever your journey takes you!