Go and make this a awesome evening. Start something, take the lead, make sure he knows how important ;\) he is to you. You'll be gaining ground in your R and OW will become more and more irrelevant. Focusing your energies on OW will make you less happy, distract you from what needs to be your focus, which leads to an overall negative outcome. Just don't focus in that direction.

Work on new "memorable" experiences. Push the past further back and off the radar. It looks like he's willing and looking forward to a positive future with you, don't kill it.