Hey EM, sorry to see that things are still not going so good on the nightime front. My LO also used to have 1-2 NWs of crying for short periods. I would give him a minute or two before I would go in, because most of the time he would just settle himself. He hadn’t done that for a few weeks now, but two nights in a row woke up screaming and would not settle. He just kept rocking from his side to his tummy. Gave him meds and he settled within 15min. Gave him meds the last night before bed and no further NWs.

Before, if DS had flipped over and needed help I would flip him back and run out of the room, otherwise I find that he can’t settle if I stay. Don’t know if your NWs are short or long? I find that makes a difference as in the cause of them for DS.
DS also doesn’t seem to like me in the room (this took me a long time to figure out)

I had tried shh/pat, PU/PD etc. with extended screaming and crying sessions when LO was 4 months and having trouble with bedtime. My mom told me that maybe I was the reason for the crying and to try getting out of the room. He fell asleep within 2 minutes of me leaving the room that night, same thing the next night and haven’t had any big issues since then! The only thing that he could really tolerate is me putting my hand on his chest/back for his NWs and I stop doing that as soon as he flips on his side with his feet up against the crib (otherwise he just keeps flipping on his back and staring at me for a few seconds – as in “go away mom”).
I know that if my last A is too short I am guaranteed an earlier wake-up, but only by ~45min in the morning. (Currently last A is 3hr20m).
Hope my rambling helps!