SO...fix the 2 problems you have. my suggestion would be to buy the 06 motor (if it's complete) since it is so cheap, and use the supercharged top end of it on your car (gen V top swap). if it were me I would pull the motor then fix everything just to make it easier on myself, but I don't know your mechanical skills or vehicle situation. keep in mind there is some custom work to be done with the gen V swap