IMHO, it's time to pull the buggered motor out and sit them side by side for comparison, checking etc... sounds like you want to use your original injectors and glowplugs anyway, so why not remove one of each and compare sizes etc? If it's a manual trans, you can check your clutch and replace as necessary while the motor is out...save you a lot of swearing later!
Sorry, just reread the original post regarding injectors and glowplugs, but you are going to remove yours anyway....probably easier with the motor out and partially stripped.