I just did this last week, and will again tomorrow although i fly UA SFO-LHR then BA to GVA. SInce Switzerland is not in the European Union, there are not immigration lines for me at LHR -- and it took 1 hour. Have done similar to you with immigration and it takes 1 hour on a good day, 1.5 to 2 on a bad day.