WW now, birthday and half-birthday later... Wrrr:).
Push for 10am tomorrow, keep second nap set at 3pm or so and go for 7pm BT?
Just thinking... Maybe you should start to work on his playtime in the crib? I mean teach him that it's fine to wake in the morning but he should quietly play in his crib until 7am? Maybe some plush toys in his crib, maybe some playtime in the crib during day to encourage him to do it?