oops, I think based on this latest interaction you need to kill the trip. Yes you two will be going as friends. I am so afraid you will go, have an awesome, but platonic, time, and then she will come home and BD#2 you. As I said, I've seen it several times before including currently here a couple of times.
Likely, she is going to go on vacation as "working on the relationship", and then use it as an excuse later. "We tried everything! We even went on vacation together."
As far as the itchy trigger finger. Remember, if you do not give this enough time you will look back with regrets. "If only I had given her a couple more months." Etc.
Earn your way out. GAL. 180. Detach. Become the best oops you can be. Give her space. Let her go to get her back. But give her time to deal with her own crap. When the time comes to cut bait you'll know without a doubt.
M(53), W(54),D(19) M-23, T-25 Bomb Drop - Dec.23, 2017 Ring and Piecing since March 2018