Help making my financial setup more mustachian

Treat all your assets including 2nd pillars as one portfolio. With 3rd pillar money being blocked for long time, it makes sense to allocate them to stocks. And yes, finpension is better.