This paragraph from the General Directory for Catechesis from the Congregation for the Clergy might spark some useful ideas:
The profession of faith inherent in Baptism (241) is eminently Trinitarian. The Church baptizes “in the name of the Father and of the Son and of the Holy Spirit” (Mt 28,19) (242) the triune God to whom the Christian entrusts his life. Initiatory catechesis—both before and after the reception of Baptism—prepares for this decisive undertaking. Continuing catechesis helps to mature this profession of faith, to proclaim it in the Eucharist and to renew the commitments which it entails. It is important that catechesis should unite well the confession of christological faith, “Jesus is Lord”, with the trinitarian confession, “I believe in the Father, the Son and the Holy Spirit”, in such a way that there are not two modes of expressing the Christian faith. He who is converted to Jesus Christ and recognizes him as Lord through the primary proclamation of the Gospel begins a process which, aided by catechesis, necessarily leads to explicit confession of the Trinity. (General Directory for Catechesis, Art 82, (AD 1997); emphasis added.)
Pax Christi tecum.
John Hiner