Hi grizmom! I'd say remind him. Yes, it's annoying that you have to, but he has "proven" himself on this issue. It won't be any different this time, so don't set yourself up by expecting it'll be any different this time. Even though both scenarios are triggering, it seems one will be over sooner, and that's a good thing. Like you said, you want to get this done asap. Soooo, the reminder is the quickest way to make this happen. Even if he is late, you can get it done. Then you won't have to play "mommie" anymore. Which I'd imagine is something you quite look forward to, yes?
Just keep reminding yourself: "free of this nonsense soon, free of this nonsense soon". Repeat as necessary. Best of luck and keep us posted. It's hard, but will be sooo worth it!