I like the idea of alternating squatting or pulling first in the session. Increased frequency also seems to work very well for you. I think with all that you have going on right now, a routine where you spend less time analysing and working on special exercises and more time doing simple three lift variations will be good.
What about keeping speed bench work?
Don't call it a comeback