I also considered the same and included HM EDT in the group. RM (albeit a fine fragrance), seemed to evolve faster and down to a basic vanilla. In the end, I decided to go with HM EDP.
I find it has more of what I was looking for--the chocolate (whether this is an actual note or an accord no one seems to know), blackcurrant, and the comforting warmth. But the main reason for me was the complex, multi-layered composition. The notes are much more interesting in HM EDP.