Updated to iOS 9 - Horrible Experience

I updated my iPhone 5 and my iPad Air to iOS 9 (then 9.0.1, tonight 9.0.2) and never have I been so frustrated with the results.

I first noticed something was amiss when my instant hotspot stopped working, then noticed that iMessage (i use my phone number as my identifier) stopped showing up on my iPad, and my two mac computers. Looking deeper I found that my iPhone only allowed iMessage to my phone number while all other of my registered devices with my apple ID (including another iPhone 4s) no longer listed the phone number associated with my iPhone 5. At that point all my legacy iMessage conversations were broken. In an attempt to fix the issue, I factory restored my iPad and iPhone 5. iPad behaviour was unchanged, my iPhone had all of my emails and phone numbers show up but the phone number for my iPhone in use was grey and spinning. I did another factory restore on my iPhone and rebuilt without my backup (I am several hours into this **** now). At this point all of my devices, including my iPhone have all the same phone numbers and emails available for iMessage, but not the phone number for my actual iPhone!! My phone number is gone from my Apple ID all together. I am not happy to have fallen into the apple trap of alpha testing their iOS 9 software! I would love to roll back to 8.4.1 but that attempt failed, iTunes gave me the following error when I tried "The iPad "iPad" could not be restored. The device isn't eligible of the requested build."

Is there a way to restore my phone number to my apple ID?

Regards,

Sean