Thanks Kristen.
I went to bed early, so I also pm'd Rachel and she said she is going through something similar with Ryan. I was thinking along the lines of giving him some water, but like Ryan, Grant will not settle after he sees me - gets him more excited.
Rachel suggested not going in and letting him CIO.
He didn't awake until 3 a.m. and I let him CIO and I don't think it was long before he was back asleep and awoke at 6 a.m.
So - we're getting back on track, thank goodness.