BTW, Fr. Rutler correctly defines "Epiphany" as "manifestation". In the Maronite Church, Epiphany is the day of our Lord's Baptism ... IOW, His first manifestation. Today, we celebrated Sunday of the Finding of the Lord in the Temple. Epiphany will be celebrated on January 6.
Epiphany = Manifestation (initial) of our Lord to Gentile "world", i.e. the Magi.
Theophany = 1st explicit "manifestation" of the Blessed Trinity at our Lord's Baptism in the Jordan by St. John the forerunner to start His "public ministry".
Perhaps the 2 Feasts are celebrated together as one.
There are 3 first visable miracles, the wise men visit, the baptism of Jesus, and the first miracle at Cana.