Hmmm... I tried this, but it will not let me delete all my email addressees. It always requires me to have at least one email.This is what I did to fix mine. I removed all emails from "you can be reached by iMessage at" then it automatically added my phone number after a few seconds and it asked if I wanted to use my number for iMessage and Facetime.
Give that a try, hope it helps.