Just because of the tax advantage, I wouldn't repay it and because with more equity you get a better interest rate for the single-family house. Stupid question, but why are the 600€ bothering you? Hopefully, that will be mostly covered by the rent.
I'm actually leaning that way too, if it weren't for the high monthly burden. For the monthly household burden, it makes a difference whether I pay 600 euros for the next 6 years or 150 euros for the next 25 years (I just made up the last number, not in the mood to calculate it exactly right now). By the way, the 40 euros tax advantage is monthly. And sure, I also get rent for the apartment, but that's already accounted for in the household budget.
But now I finally have feedback from the bank: They would in principle agree to a prepayment penalty with complete repayment or an extension of the old loan. BUT: They would also like to finance the new house. From the bank's side, that is the right idea, I would have said the same in their place. That means for me: If possible, I would keep the old loan because of the tax advantage and stretch it from 6 to 25 years (to lower the annuity). But that only works if the bank offers a good interest rate for the new construction and it is worthwhile. And that has to be seen then.