@3D-Q
I see from your post you are planning to do as I stated above.
Yes you will have to file Form 5329 with your 2024 tax return.
