I usually take that upgrade price offer when i see it. It makes for a much more pleasant flight.
I'd say 3 hours to LGW could be pushing it if Immigration have an off day or theres any traffic. Saying that if its all on the same PNR i suppose it is BA's problem if you miss it (anyone care to confirm this with LHR->LGW connections?)