It sounds like you have the right thing in mind. I sort of think of upgrades in order. First get it playable, then the things that make it more playable or sound better. First the tuners, then the nut, then the bridge (honestly, though, I rarely think about the bridge unless it is bothering me in some way). Electronics are the easiest thing to replace and won't change the appearance or mar you finish if you do it later on.
By that logic, you might consider upgrading the nut before you put finish on it...
Yes to the nut upgrade! I hadn’t factored that in...mea culpa!
FrankenLab Hand crafting guitars, because Death Rays are expensive.