Bit more work on the neck, headstock and back of guitar body.
And decided to go with some ToneRider Alnico IV classics combined with CTS pots, Sprague Orange Drop caps and braided shield wire. Figure I don't want to have replace these things too often so bump up the quality a bit.