...I really don't feel like fighting that fight righ now, so I think I'll flash the device from ground up and just upgrade up to 3.2 for now...