I read a piece last winter from a home energy group that said people are usually shocked by how much air leaks matter more than the big stuff. The comparison they made was that sealing up gaps and adding insulation often costs way less than new windows and saves about the same. Windows are a big ticket item but the payback takes forever. Did you end up going with the heat pump because of the rebates? Those tax credits can really tip the math.