[RWebb]

I would fix every thing to do with the evap. emissions system right away.

Can any sort of barrier (e.g. FS25 sheetrock walls) be erected between car & heater?

A bigger todo would be to get the heater out of there and put in a tankless hung on the outside of an ext. wall.