Thanks Gavin! Those are some really nice guitars there.

Thanks for the advice Tindrrel, I've been looking at the neck join and I think I can live with it as is, the scoop is sort of angled so one side sits almost flush but the other doesn't, and shimming seems like a lot of work for potentially no payoff really.
I also decided to stick with the supplied bridge after I found the prices on Hipshot bridges ($200! Damn), and realistically if I become incredibly attached to it I can upgrade the parts later in life.

I also bought the Tone Monster SBK-3A since everybody seems to rave about them, and they're so much cheaper than going a full active pickup path