Toddler Insomnia?

So, we had two nights in a row of all-night sleeping, and then we had last night. Saw woke up at 3:30, and Rob took duty. I didn't really fall back asleep and could hear things not going as well as they normally do. Around 4:15, Rob came back to our bed, with Sawyer and a bottle in tow. We both figured this would get him back to sleep, but when he finished the bottle, he sat up and started talking and playing with the covers and just generally doing awake things. I took him back to his room and tried to put him down. Screaming ensued. I followed this with some serious prayer and tight-hold rocking. After what seemed like hours, I felt that he was asleep enough to transfer...and I was right. At this point it was 5:30. And yes, he still got up at 7am.

I still feel like we're recovering from taking a trip and getting him out of his comfort and routine. What complicates things is that, while we are not cry-it-outers by any means, there comes a point in the bed or nap process when Sawyer might throw an angry fit to get his way (ie, to get up) and we both feel that he needs to know he doesn't get his way. However, since we've been back, he's had a bit of a cough, and this I think affects his gag reflex, so if he really cries, he throws up. Which means cleaning him up, cleaning the floor up, cleaning the bed sheets and blankets...Plus, a sad little boy, because who likes throwing up??

So we're stuck in this hard place of really having to respond even at times where we would normally let him work it out a bit on his own. Which means that, other than the few nights he's gone down easily and slept all night, we're all getting great practice in for the new baby.