It sounds like you've got him crawling back. Remember to take it slow, don't get your hopes up too high, but just let him come back to you at his pace.
Have a safe flight, take some anti-anxiety medicine and enjoy Berlin. You'll have a blast and he'll be missing you. I'd be surprised if you didn't get several texts while you are away.
