Upgrade to 3.1-no emails iPhone 3G

Hi. Just updated to 3.1, and now have applications all over the place (not in the same places they were), which can be solved simply by moving them manually, but the big problem is that all the email accounts, along with messages have gone. They are all POP3 accounts, not exchange etc. I also noticed that my Wi-Fi config is no longer on there.
Im really stuck without the email, and pretty annoyed that Im spending hours again on apple products/updates - very annoying after my Snow Leopard issues.
Anyway, I connected the iPhone to my mac (which is bang up to date with OS updates, and running unfortunately Snow Leopard). It went through the process of updating but it failed to update, so the only option I had was to restore.
Now, iTunes took a backup before updating (or failing to update!) so shouldnt there be a full back up including my emails somewhere? All be it on a backup from 3.0.1, not 3.1, so is there a way I can get this info back, or indeed restore back to where I was at 9am this morning before this whole fiasco?
The phone isnt jail broken, and is on O2 UK. Hopefully once I get this sorted I can get rid of the iPhone and go back to Blackberry!
Thanks in advance.
MacBook (Black) Mac OS X (10.6)