Variant 2 is not quite correct. Heat pump with [Option Photovoltaik]. At least those were the two alternatives for heating technology in our case. Although with the gas condensing boiler you will probably definitely need solar thermal, right?
It would also be conceivable that you install a heat pump and prepare for [Photovoltaik] during the new construction for later, meaning you already lead the pipes upwards. Then you can possibly observe the market a bit longer and consider [Photovoltaik] + (storage) in 2-3 years.