Thank you very much for all the suggestions. My first choice would be to stick with BA because I am on a mileage run to retain my BA gold status this year (my work is mainly domestic USA so not much chance to do international travel this year).
The TGV train sounds like the best fit right now and I get there at 13:33 which is pretty good!
Does anyone know how long it takes from Geneva to Lyon?