Definitely replace the heater core while it's out...spend the $25 now and avoid having to rip is all apart again! It's not hard swapping dashes, just time consuming and cramped. Just be sure to take it slow to avoid from breaking the little plastic clips and electrical harness clips...