Endowus SP500 or CPF SA?

Hi Gurus,

​

On Sept 2022 I invested CPF-OA 25k into LionGlobal Infinity U.S. 500 stock index fund via Endowus. As of today(15 Mar 2024), it's $30,730 (+23.29%)

​

In a span of 17 years (by then i will be 55yo), should I

​

A) keep the fund in the Endowus and invest for another 17 years then withdraw to OA then transfer to SA then convert to RA.

​

B) withdraw the fund to OA now and transfer to SA immediately and let it grow for 17 years and convert to RA.

​

Currently my OA has 20k and SA has 49k.

​

What would you choose?

Thanks in advance.