More work and something of a result!
I have the Canadian needle at the leanest setting, 137.5 mains, 42.5 pilots, mixture screws at 2.25 turns out. It's a bit fluffy off idle, but no more savage miss at 2500! From 4500 to redline there's some flat spots. This seems to suggest 140 mains but then...