Hi Susan,
Sorry you had a rough night,
If it makes you feel any better, our social life (such as it is) revolves around ds. We go out according to his, now one, nap, so if we are invited for lunch, we won't get there til he has napped properly, and if it is an earlier appointment, we won't go!
I know this sounds sad, but i think routine is important especially if they have got out of it.
What time does your dd go to bed? We have started putting theo down a half hour later again, 7.30, even if he naps only for an hour, which he does in the week cos he is at day care.
I don't think the pu/pd has had any conseuences, cos i was really regimented wihthi at 6 months when he went into his cot in his own room.
Jo x