Yes, Ovi Maps - on the pre-release image on the N950 - isn't an adequate replacement, even with its custom "Drive" app:

• Colours are grey and light grey on a white background. Not very visible.
• No favourites in Drive.
• No longitude/latitude destination.
• No ETA.
• No speed camera warnings.
• Some searches still seem to go online. Haven't fully tested offline use yet.
• No waypoints.

So as long as the N810 is going, and the Wayfinder licence hasn't expired, I'll be continuing to use it as my main GPS. I'm not convinced my next phone (an N9) will be able to replace it and may have to buy a custom GPS.