Of course you don't want to leave him to cry. That's his only way of communicating and it is so wonderful that you are there for him whenever he needs you. With those pesky people - in one ear, out the other.
1 NF (maybe even 2) is still normal at this point. Have you tried settling him in any other way? You of course could try PU/PD but remember that it will be in the middle of the night & it is so hard to ST at that point. If you feel you can do it, go for it though. I know its late in the game, but have you ever tried dreamfeeding him? I wonder if that will at least help us eliminate hunger as the cause. I'm not sure how advisable it is to try this late though -- Katie? WDYT?
Other than that, all I can say is that if you stick to this routine and slowly keeping upping the A times, at least one of those wakings should stop.