So, here's my strategery:

Plan A: keep doing what I'm doing now. Developing intomesee and rekindling our friendship. Likelihood of success: 10%

Plan B: Move out, move on, don't let the door hit me in the butt: Likelihood of success: 25%

Plan C: Plan A + Plan Retro in January: Likelihood of success: unknown...

Plan C fits more with my values. Plan B plays more on my anger and emotions. Plan A plays more on my passive nature.

Of course the percentages are wild a$$ guesses.