I went through the same evolution as you. Your bolt carrier is correct. In the FE bolt carrier, the firing pin has a spring, but the bolt does not.
Mine works perfectly, and of course, no FTE.
I used to have one. If I remember correctly, the cleaning rod is slightly shorter than the regular K98 ones, and the sight hood is different too.
Neat rifle, good luck on the parts hunt.
I've been buying all of the blu ray surround remixes of the APP albums.
They all sound amazing, and there are so many songs I know from the radio in the 80's.