So I am stuck with the 05 and newer like I stated above?

If I need to do the swap, that is what I will look for!