I have had good luck with wifi staying connected on my Droid Turbo 2. If having a top notch camera is high on your priority list, then I would avoid the Droids. Also there are a couple of serious quality control issues with the DT2 -- green line and charging -- which fortunately I haven't experienced. And frequency of updates is always a question, as I do not think these phones are selling very well and there appears to be an internal struggle between Moto/Lenovo and Verizon.
If you decide to get a Droid, whatever you do be sure to buy it from a Verizon store and not Moto as Verizon is quick to resolve warranty issues.
Personally, I'm not sure I myself would purchase another Moto phone as this time. Perhaps find a S7 forum and see if you can resolve your wifi troubles.