Did exactly the same (6s #3 is waiting in storage). And preparing myself psychologically to have to retrain my muscle memory when switching to android. Samsung doesn't seem to have given up. The audio jack is just one of many problems. A highly dysfunctional iTunes (critical to sync my mp3), constant nagging for apple paid services, etc.

I have more of a problem with the ipad. If they also ditch the audio jack on the ipad, I don't think there is a decent competitor to the ipad pro 10.5 (i.e. bigger, high refresh rate screen).