So I finally found the part new using the new part numbers... it was $425 which was quite a bit less than dealer cost.

Installed in about 30 mins and so far no problems.