POSSIBLE SPOILER!
Thanks Orson. Yes, I've done that - and all the other requirements.
Including finding all the thematic words to prefix the thematic entries apart from those two.
Nelson, think of the surname of a famous Henry (or eight). For 34a, when someone congratulates you, they sometimes say "high ...". (Personally I think tea time is an hour earlier.)