Neck is completely flat (checked with a fretboard straight edge). Frets around the 22nd are level. Nut is pretty high but so it the saddle so not an issue here.
Yes, the aftermarket bridge sits lower than the stock. So this could be the main offender.
Photos with the D string installed:
I have the saddle as tall it can go.
But it is still too close to the fretboard.
I'm keen on the aftermarket bridge so it looks like I will have to deal with the issue at the neck pocket or heel.
I've measured the depth of the pocket and it is around 18.80 +/- .20 mm. Is that the expected depth? If so, I will adjust the neck heel as I feel that is the safest path.