Well....eventually gave up trying to fix it myself and took it down to the dealer. It was due for the 10,000 service anyway.
They did the service and reckoned they could not replicate the 4WD problem and that 'everything was working as designed'. I picked it up, drove 10 yards, put it into 4L...