Yes to both. The New Testament calls Jesus God directly, He accepted worship and claimed God's own name, and Scripture presents one God eternally existing as Father, Son, and Spirit. It's a mystery, but it's the Bible's own teaching, not a later invention.
The Grace Answer
The deity of Christ and the Trinity are sometimes dismissed as doctrines the church bolted on centuries later. But both come straight out of the New Testament, and the case is far stronger than skeptics let on. Start with how the Bible speaks about Jesus. John opens his Gospel with, “In the beginning was the Word, and the Word was with God, and the Word was God,” and a few verses later that Word “became flesh and dwelt among us.” Paul says of Christ, “in Him dwells all the fullness of the Godhead bodily.” When Thomas finally saw the risen Jesus, he cried, “My Lord and my God!” and Jesus accepted it rather than correcting him.
Jesus also claimed God's own covenant name. To hostile religious leaders He said, “before Abraham was, I AM,” deliberately taking the name God gave Moses at the burning bush, and they picked up stones because they knew exactly what He meant. This is not a man who merely taught good things. This is God stepping into His own creation.
One God, three Persons
The Trinity is simply what you get when you take the whole Bible seriously at once. Scripture insists there is only one God. It also calls the Father God, the Son God, and the Spirit God, and shows all three present and distinct, as at Jesus' baptism where the Son is in the water, the Spirit descends, and the Father speaks. Hold all of that together and you have the Trinity: one God eternally existing as three Persons.
It is genuinely a mystery, and a finite mind will not fully contain the infinite. But it is not a contradiction and it is not a late invention. It is the Bible's own portrait of the God who is so committed to saving you that He came in Person to do it, and this is not a fringe issue you can set aside. It is the center. If Jesus is God, then the cross is God Himself absorbing what we owed. Grace does not get more staggering than that.