Thanks for the insight and advice, much appreciated. The bottom headtube ID is slightly smaller, but both top and bottom had shims installed.

I think it will be best to keep it simple and try and stay with the Magistroni. If I change the headset then the length of the steerer tube may become a problem as well. The Magistroni stack is quite low.