Peter, You've had good and consistent advice re the problem (or former problem, hopefully), but a comment on the "... fond of the D810". I recently upgraded to a D750 from a D7100 and it didn't take long to fall in love, but like any relationship, some aspects required a little more work than others ... I suspect that your best course of action is to spend time getting familiar with the D610 rather than to spend money on a different body.
If you are keen to part with some cash, try spending a very modest sum on this:
https://www.creativelive.com/courses...t-john-greengo I took the D750 version and it was well worth it. (And if after all that you still want to move from the D610, do take a serious look at the 750
)