I decided I was done with the interruptions in my sleep. I'm cranky enough when I get good sleep.
Rather than letting RCP comfort him, I have been going up for the past two nights. Without saying a word, I would point to his bed (and push him along if he resisted) until he got back in bed. Then I would stand there, still not speaking, until he stopped yelling and went to sleep.
Two nights ago, I did the above routine at 11PM and 4AM. Last night, he slept until 5:15AM and went back to sleep more quickly, with less fuss.
I can't continue the procedure tonight, as I'm out of town, but I told RCP the routine and I hope it works for her. It is my dream that when I return home on Saturday, I'll get a full night's sleep.