It sounds like he left the invitation open to you to come back. I'd give him a call and go to see him and resolve any discharge issues. In the meantime work on finding a t you can feel more comfortable with.