I think you have to keep navigation issues separate from other issues.

The 810 you have probably works as well as the 510 for stuff the 510 does.

Borrow your wife's 510 and see how you like it.