Yay! I'm so confused about what to do in my own situation, I have no idea about what you should do next. But I'm really really pleased that you had such a good conversation - its so cool that you guys have so much in common. It seems like you really connect and get in each other. You are doing great.
The only part I hate is that you might have flexible travel plans around when he might be there. Maybe you should just go when it suits you? Maybe you should go and not contact him before you go and see if you happen to bump into each other (unlikely I know, but I'm imagining sweaty gym clothes and unwashed hair!)
