If I were you I'd wait till note 3 is announced. Unless you don't care for phones that big. In that case you have a tough choice. The quality of the HTC one is amazing and I love HTC sense. But the s4 is great too. I currently have the note 2 and I use the airview feature all the time. Only problem is it requires the stylus. On the s4 it doesn't. That alone would make me pick s4 plus the removable battery. I'm in situations where the non removable battery option really messes up my day. So in the end your choices should be between, non removable or removable. I actually use all the features like smart stay and smart alert so those are even more reasons to choose s4.
Sent from the Great Galaxy Note 2 using Tapatalk 2