are you sure that a 3G doesn't have gps?
I would downgrade to 05.13 from 06.15, because the battery won't drain fast as **** on 05.13. also the wifi signal is much better on 05.13.
do you have the original sim in place or are you using the phone in a new country with a new sim? the SAM pref trick is blocked, so google before you start the jb and unlock...
good luck