I believe your AHV pension assumption is wrong. If you live in Switzerland throughout the ages of 20 to 65, you are obligated to contribute to AHV throughout your life. Even if you stop working at 50, it is still Skala 44 that will apply to you (and you will pay contributions between 51 and 65 based on your wealth). You will simply have a much lower average income that will be the basis for your pension.
In other words, you need 3’754’080 CHF compounding income over 44 years to get the full pension of 2’370 CHF/month. If you earn that until 50, you could even get a full pension w/o working many of those years.
Regarding how to consider this: I don’t have actual plans myself (yet), but would free up pension 2 and pension 3 funds at the point of early retirement (likely through a real estate purchase/payment of existing mortgage) and invest that money myself. I do not consider pillar 1 (AHV) as it will likely be out by another 20+ years at the point of early retirement, and given demographic developments I’m not sure how much will be left of it (even though that fear is prevalent in Switzerland for decades now).