Correct; unfortunately I can’t price that effectively for my specific house since I bought it with the solar, and can’t separate the numbers out cleanly.

That being said, we know that in the long run rooftop solar reduces electricity cost, because otherwise most people would never buy it. From my numbers above rooftop solar only needs to reduce electricity prices by ~40% to put them within striking distance of a heat pump being cheaper than gas.