You will get more traffic in this thread if you post in either the YJ or CJ section. Sorry, I don't know enough about this swap combination to be any help.
Also, you may want to post when you are breaking the pump(s). Is it on first start-up, or are you putting 10,000 miles on...?
Good luck, and welcome to the forum.