Not for me.
Unfortunately, you did not say what interest rate the savings contract has and with what rate the savings contract will then be serviced. That’s why it is difficult to calculate exactly.
If I calculate everything only with an annuity loan without the savings contract, I have a remaining debt of less than €72,000 after 15 years with a rate of €900 and a €2,000 special repayment. Then the interest rate can rise to over 8% and you are still finished faster than 25 years (without special repayments after the 15 years). If you can still pay the €2,000, you will be finished after about 22 years despite 8% interest.
With €3,000 annual special repayment, you will be finished after 20 years.
With the savings contract, even with €2,000 special repayment, you really have no time to take advantage of its benefits, as the term is too short.
Also, without the savings contract the risk is gone that the savings contract might not cover the remaining loan after 15 years because no special repayments were made. There should not be much more than €40,000 in the savings contract after 15 years.
In my opinion, savings contracts are all just a glossing-over of the interest rates. That they are paid on a much higher amount is not revealed by the bank.
Do you assume that the interest rate will rise even higher than 8% and that you will not make more than €2,000 annual special repayments?
If yes, then the variant might fit; if not, then leave the savings contract out.