Thanks, Rob! It will be corrected if/when THIS Bird goes into production or if I take it to NAMM. The guard was cut before I decided to do the pup rings. I think it has to split the distance between the pups and the top curve has to be slightly different, basically your second alternative.
This bass presented problems in that it's been around since '83. It had been hanging on my wall sans electronics taunting me for years before I stumbled upon LBO. The neck should attach to the body one fret lower, the pups are not centered vertically and the bottom horn is still too big IMO, even though I've trimmed it twice. The original control cavity doesn't allow any more trimming. Those are TB+ size rings and toppers, bigger than 60's dimensions, that would also affect the appearance. Everything is always a matter of mm.