I too am awaiting the new phones from HMD and Nokia. But after using OnePlus smartphones for over 2 years now, the choice will trickle down to what Nokia offers and what price point it targets. Now since Nokia's service centers, retail partners and supply chain is mostly gone, I expect them to price their products more aggressively. If this will be another round of earning excess money out of brand value without actually adding anything amazing, I'll just settle for the next OnePlus smartphone again.
Pricing of Nokia 6 is kinda already on a higher side considering that they are still with a 4xx series processor (SOC). Hopefully the upcoming devices will provide better power and price ratio!