I've solved the intonation problem by making a new barrel. It's about 1.5 mm shorter than the original.
Now all of the tones play reasonably in tune, though the low E is still Al little flat. Another smidgen shorte might help, but that's more trouble than it's worth.