I do hope you are slackening the pipe unions when buggering about moving the pump. If not expect a nipple to break off any time soon. To get a diesel timed up is not that hard but you do need a timing chain in good condition and the cam set correctly. Try and borrow a timing tool to do the...