It's funny how dreams work. Before my wife had the courage to tell me she resents me and before she moved into the living room, I had a dream that we made love. I woke up and rested my hand on her shoulder. Haven't dreamed anything like that in a long time.
That dream was followed up by dreams of her being aggrivated with me. I recall feeling hurt. Now days she's almost never in my dreams. When she is she's bitter towards me, but I do know that it doesn't invoke feelings of hurt.
I hope that means progress on my part seeing as how we can't really control our dreams. Either way, your dream sounds very nice. You're happy with your current relationship, so maybe your dream with your X is kind of a peace in you......