Of the two I'd go with the Z Force for only two reasons. 1. Much better battery life. 2. HTC has an issue with overheating chargers because of their mishandling of their USB C implementation with QuickCharge. That is another phone that is unfortunately dangerous.
I really love my N7. I am having zero issues with it. If I were to try something else, it would be the new Nexus(Pixel). Reason being, I have not owned a Nexus product since the Nexus 7 2012 tablet.
I will get another Note 7 once they are available. No interest in anything on the market or coming. The Pixel XL would interest me if they were not being made by HTC.
I'm on the fence, I'm gonna sleep on it for a week. I wanted the Note 7....this may be my opportunity to try out all three colors though. Started out with coral blue, on the black.. Silver here I come!
Will get new unit or do nothing, probability is on our side my friends. 42k to 1...
The other thing is as the time goes by and nothing happens, probably nothing ever will happen.
There is nothing to come even close to note 7, maybe note 5 or note 4.