I put in a new fuel pump when I was doing my swap, It really wasnt as bad as I thought it would be. It just took some patience. Let me know when you are gonna be doing it and I might be able to help.