Excellent reply, thank you. This and the replies that followed will give me things to research further.
A friend of mine just switched his 5 out for an SE and is quite content with it, so there's that option, although it seems like it might become the last compact phone Apple will ever make. The big advantage to Android is that you can change most of what you see, with the downside that you won't always get the latest features unless you're in the Google phone branch. I think of all Android phones, Samsung has the most refined OS. It might be a good idea to just go into a store and try the S7 out. If you want to look into a wide range of devices, I highly recommend MKBHD's reviews, they're always on point. I've bought my three latest phones and a bunch of other tech mostly based on his reviews.