Pulling the battery on the M screen after your re-boot from the upgrade was not a good thing. When the phone is sitting on that screen it is actually performing the writing of the update to the phone. Mine too sat there for what seemed like infinity... but was not really that long. I just put it down and let it finish. I have seen posts in other threads that people have recovered from your situation.