Baptism Concerns

So about five years ago, I was baptized by a friend in a lake, but I am uncertain about the validity of that baptism since neither of us can remember if the proper Trinitarian formula (Father, Son, and Holy Spirit) was used. I am deeply concerned about this, especially because I’ve heard that the process of catechesis and eventually being baptized into the church can take up to four years. Given these concerns and the lengthy process, would it be possible for me to be baptized again (correctly) outside the church before fully entering the church and then receive chrismation after completing the catechumenate process? Also, I would be entering an OCA parish which I read accepts baptisms outside the church as valid as long as they are done within the proper trinitarian formula?