Should I add him on fb or wait for him to add me?

Add Him!!! Its obvious you like him. FB is a great way to stay in touch with people and also cheaper, lol. And ignore the friend, do what makes you happy.