PL, I think you are doing things well. I would flat out ask him if he's going to give you "the speech" again, because you don't want to go if he is. Anyway, what I would try to do emotionally is remember that it isn't really your anniversary, because you really don't have a marriage relationship anymore. My W completely forgot about ours (what a surprise) and I was very glad that I had only gotten her a gag gift. Best of luck on your trip!
The LORD is near to all who call on him, to all who call on him in truth." (Psalm 145:18)