After a lot of hunting in the past 24hrs I realize what I really need is not another diagnostic tool but one that will let me reset programs and clear adaptations.
As Maupineda says, ISTA+.
I see that that Foxwell says the NT510 does some of that but when I read the 1 star reviews of that unit there's quite number of people saying there are a lot of problems communicating with the ECU and virtually no support from the company.
I think I'm going to have to find someone local and pay them to download it for me and set it up on my laptop so I just have to push the ON button. As a dedicated DIYer I hang my head in shame.
