Are we over, control games, waiting to dump me, or just need time?

hum, this is complicated! but i have been in the same situation though so i think i can help. all fights are different, sometimes it takes longer to get over them than usual. even though you have apologized and he accepted, he may still be trying to get over it. i doubt he's still mad at you because you two are still going on the trip. i think perhaps it may take some time to iron out the wrinkles in your relationship, so give this trip a try and don't try to make things happen that he's not comfortable with. in the end after you give it time and it still feels awkward, perhaps it's time to talk to him again or move on. good luck =)