Is there a way to go from 1.1 to 2 without reinstalling everything? Last time I tried this I lost all my customizations.
I don't remember you reported your upgrade problem - so hard to answer that.
I just remember XBMC freezing and Amber not installing and change in microUSB as solution.