I've since decided to (eventually) get a Garmin 820 as I want the mapping (I don't carry a smartphone when I ride). I'll probably pick one up next month.
Any comments on the Garmin Edge 820?
(I've found a good review at:
https://www.dcrainmaker.com/2016/07/...-edge-820.html)