There is a calculator to estimate how much you get, see link below.
I believe it is also possible to close gaps that are not too far in the past.
Regarding AHV I’d rather be worried that some future reform slashes benefits, maybe only for those who had a better salary throughout their working time.