Okay! I just got back from the gym. They changed the cages and no longer have straight safety bars, just slings for squatting. Bad day, got myself pinned. Very embarrassing.
Setting that aside, I'll take the advice y'all gave me and completely replace my bench press with incline dumbbell press. There are many advantages to that beyond the physical ones.
I recently had rotator cuff surgery, and although my shoulder has never felt better I don't want to mess it up again. I do need stronger arms and chest for my sports and I can do incline DB press at home. So all good.
Follow up if you guys don't mind: Will incline DB press work my arms much? Or will I need to add something for that? I do not compete, I'm just looking to stay strong for sports. I tend to ward compound movements for efficiency.