Have you checked to see if there's award space on the OAK-LGW flight by the way? No A380, but would solve your connection problem. Availability tends to be fairly good on that flight.
Alternatively you could book the 3h option and just monitor to see if the earlier SFO flight opens up and change if it does.