Hi Spark,
I am also will be leaving to my home country (Non-EU, with no agreements with Switzerland). Did you manage to find out if your calculation was correct?
I am trying to find out the meaning of "Current value of all OASI benefits accruing to a beneficiary in the same personal circumstances" as written in the following links:
https://www.zas.admin.ch/zas/en/home...tisations.html
Thank you.