I'll put it in when it arrives and my newly found Luthier can have a crack at a setup.

You'll never guess who it is. A clue: 3 of them, working as a small team. They don't turn out many guitars each year but they are highly regarded.

Thinking caps :-D

-F