jskoland,
get spb back up and create a full backup/restore. Do a hard reset and try manila 2.5
if you dont like it do another hard reset and run the spb back up file that you just create. It will revert everything to the way you had it to before.
that's exactly what I did and it beat spending 3+ hours installing everything again and moving things around to the way I like it.
** UPDATE ** I just PM'd you something special. Enjoy.