good job DA10, we all fall down, its how you pick yourself up and continue that matters.
Stay away from relationship talk right now. Until he moves into that apartment dont worry about it. He has made it known he feels that he needs its. Validate that to him. As for the workshop, just that he spoke about it is a good sign. means he hasnt ruled it out.
Keep looking after yourself. i would say that last night was not a mistake, you handle yourself fine.