Went to sleep doing that, and sadly it looks like the phone doesn't accept the what's left of the old userdata partition. Lost around 400 images from 4chins and however many hours I'd need to restore my programs/modules/etc.