just to add to my inner turmoil...
We hung out for an hour or so and after awhile he started stroking my hair and then leaned in for a kiss... he asked if I was OK and said he didn't want me to do anything I was uncomfortable with, and especially didn't want to hurt me since he's leaving in less than 2 weeks. We kissed and cuddled for awhile, then he walked me home, and I'll probably see him this weekend.

Haven't sorted out how I feel yet...