Ok at this point I would say get the 2.1 sbf and flash it with rsdlite. Bam back to stock unrooted droid. Sent from my Droid