i'd do a full flash + emmc I did that yesterday took about an hour to re-install apps, then about 45 mins to customize my device again - icons, backgrounds, debs etc.... i've documented everything i need for next time so i should be able to do it alot quicker full reflash is the best way to go i think