Mila--perfectly handled! In my opinion, you don't want to be doing more than he is (smiling first, greeting-kissing first, or being "warmer") before he's ready. Wait till HE makes the moves to start being your friend first. In my case, the more my H withdrew, the more I withdrew ... and the more I treated him as someone who was not in the centre of my life anymore, the more that forced him to start thinking.
I love that you chatted as long as you wanted with the barrista while he sat there high and dry--well done! Now, no second-guessing yourself: stick to this path.
