A slight tax optimisation for later will be to open up to 4 extra pillar 3a with viac to generate an equal size of investment in the 5 accounts at retirement age. You will be able to close 1 by year before retiring and lowering tax.
You should stop contributing to your actual 3a until the 4 other reach the same amount.
For the 98kchf cash, you could slightly change your risk aversion strategy by defining an Investor Policy Statement.
Especially the target allocation and focusing on rebalancing it.
I feel you as I am still fighting it but defining one help me through the years. I am following it yearly in my portfolio.