T-mobile released oos11 for the 7 pro. So I reverted back to their version of oos and got the update 3 days ago. It's been perfect. No lockscreen bug, no black screens, no flickering.
I do miss the dual sim slot but I'm sure future versions of global will fix the t-mobile issue lol.