Fredrickdoc,
I see a logic to your theology. However, my alarm bells go off when theology rests on one and only one definition of proof text. Let's look at the full context of your Matthew 3 reference
John the Baptist speaking:
11“I baptize you with water, for repentance, but the one coming...