not alone - I made that decision over the last weeks too for similar reasons
Always fly into City as, even with bag, can be in office in 30 mins after landing (at which point I would still be waiting for bag at LHR...or half way through the waiting time at Gatwick!)
delays a couple of weeks ago meant the "waiting area" was standing room only with people having to find bits of floor to sit on...not comfortable at the best of times
Coupled with the fact that (despite travelling at different times up) Edinburgh Airport seems to find it amusing to bus you to the furthest part of the airport at gate 17 for you to have to trek all the way back (given that there are no flights leaving from the far away gates that time of night you would think they may, at least, reverse the travellators but instead they just turn them off...At least the LHR will go on a stand with a jetty) and not leave you walking for miles.