I can think of a couple of things to be checking. One for sure is the compression in all 4 cylinders. You need to have about 400 psi to meet minimum specs. I think 480 is normal. So get on that first. You have to have an adapter that replaces the injector in order to do the test. Or you need a fitting that replaces the glow plugs. The injector one is the better option as getting the GP's out from behind the IP is a pain in you know what!
Then could you have advanced the cold start lever, not the choke, when you did the rebuild the first time? I am thinking you had it running already pulled out even though it didn't look that way. That would be advancing the timing and even if you thought it was spot on now it is like you are timing it with the cold start lever pulled. That would not apply to the other pumps you have purchased. Money wasted in my opinion. Never just throw dollars at a problem, find the problem then buy the parts to fix it.
So with multiple pumps, you still have a poor performer. Could be rings, could be head warp. A compression test will tell you what you need to know there.