Ryan,
Don't know if you know about this web site yet.Might help you on the swap:

TheDieselGarage.com