That sounds like a rotten night. We've had lots of long horrid nw's here too and like you, no teeth, but lots of symptoms of teething. If she doesn't settle after her nf, I'll give her ibuprofen after about 15 minutes, then feed her again (I know, I know) and fx that's been doing the trick.
As far as your early mornings... What time do you want him to get up and what times are your school runs? I ask because I think his first nap is too early. I felt rotten doing it, but the only way I can cope with Medi's ew is to really delay her first nap. It's 10 am now - no earlier. I do one short and one long nap as well. Personally I'd prefer the am one to be longer but some days it's the shorter one.