So as a 6P owner, I decided to return it back to Google because they don't want to honor my warranty because of paint peeling, which is a known issue. I decided I want to go back to Samsung for an android device. I am thinking about the Note 5, S6 Edge Plus, S7, or S7 Edge Plus. Which device would serve me best? My head is telling me to wait till the S7 Edge Plus because it will have a potential SD slot, a water resistant body, USB Type C, 3D Touch, and a better battery life. I am concerned with the software. Has the aggressive ram management gone away yet? I really miss my TW UI and some of the features. Am I better off saving money and going for the Note 5 or waiting and drop the extra for the S7 Edge Plus?