Why are you waiting until May? All of what you've written is based on your expectation that he will walk in the door, realize he's been foolish, sweep you off your feet, carry you to the bedroom and all will be well.
And I am not sure if I am coming across all wrong here. I think I've said this A LOT in this thread and my other. I DO NOT EXPECT him to do what you've listed above. I don't know why you think that.