You did tell her she looks amazing in the dress right?
You will live no matter how things turn out B.....That is a big thing with DB, you get to make that realization without a soul filled with anger, hate, shame, etc.
You are in a good place B....Time is your friend and your are gal'ing inside your value system. So keep it up.
The trip sounds excellent as you sound a bit of a garden fanatic.....I vote for yellow roses, but that is just because I have an awesome yellow rose bush in front of my house LOL.