Looks like you are on the right track. We have not used the new internal kits for the fuel pump. Not bagging on any of the above company's parts. It may not be their parts but I have heard about a few people having issues and causing damage to their engines. This very well could be user error installing the parts. We do not currently have a fuel pump out, The only other real option out there is a CP-e fuel pump. That is what we are currently using in our car. Just wanted to