Catechism of the CC agrees with you. Simon, renamed Rock, is the rock on which Jesus’ church is built. Jesus is the divine Rock on which His church is built. The church built on Rock is based on Simons confession. The three are not mutually exclusive. The difference is: non-Catholics deny the second claim. Of course I understand why though…

The gates will never prevail against the church built on Peter, based on Simon’s confession, with Jesus as the divine Cornerstone holding the whole thing together. Without the Cornerstone, the church built on Peter would fail miserably.
Grammatically? Cool.
OK. However, God still changed his name to signify something important. What was that reason? Why?
What seems to be of the utmost importance is the fact that Jesus, based on Simon’s confession/profession that Jesus was the Son of God, changed Simon’s name, and he did it for a reason.
His proclamation is important because; what Jesus says because of it - very important. That is how we can identify the church which Satan will never vanquish.