If you had simply used Kubrick, you'd be done by now
It only reflashes the main system, and doesn't touch your settings or content. And, it comes with the latest 3.4 firmware with the jailbreak included. Much less hassle than trying to figure out what the current configuration is, uninstall things one after the other etc.
Of course, that's just my personal opinion.