[NiHaoMike]

Then move the first pump to the outlet of the boiler.

The path for solar directly heating the DHW tank is running the boiler pump (but not the boiler itself) and the direct solar pump with the direct solar valve open and the three way valve set to send the flow through the storage tank back to the direct solar pump.

The heat loss from the boiler should be minimal when the inducer isn't running, but you can also add another pump (as you did in your drawing) to bypass it altogether.

The 40 gallon thermal storage tank can in fact go above the usual setpoint when heated by solar. That won't reduce the heat pump efficiency since the heat pump won't be used until the tank goes back below the 90F or whatever point.