Both options seem too pricey. I'd try aftermarket as well - usually found at your detail/stereo/wheels/accessories shop. Replacing the heater itself and using the existing wiring shouldn't be such a big deal. Lots of these accessory shops do it all of the time.