I've got things untangled enough to where I can begin to see what's going on.,
The basis of the problem is in the names, repeated not just in generations, but in uncle to nephew.
So I'm now going through and straightening things out, according to the source work.
Will report back when it's clear -- I'll lock it down after that, as this is a very vexed piece of the Scots tree.