I tend to go with the 1/2 hr still awake, get up rule, but that was from when DS was a bit older (9m). I don't like to leave till upset, as sometime it is hard to come back from IYKWIM.

How did he cope when you got him up? Sometimes no matter how hard I tried DS would miss a nap, but catch up in the next one... Hard one...