Believe it or not but i haven't done anything yet.
BUT what i'm going to do is this:
1. Get my 3GS fixed next week
2. Wait until the next iPhone comes out.
After using out my girlfriend's Samsung Galaxy S for 3 days, i've concluded that Android truelly sucks (mainly because of weak, ugly apps and the constant crashes).