Although I agree with what you are saying and I accept the Trinity, I can't accept the "dictionary" source you use.
And here is what God means in the Greek; (Keeping in mind that the word Jehovah dosen't appear in the Greek)
1. a god or goddess, a general name of deities or divinities
2. the Godhead, trinity
1. God the Father, the first person in the trinity
2. Christ, the second person of the trinity
3. Holy Spirit, the third person in the trinity
That is totally subjective.
It's what WE (Christians, bible scholars etc) accept the word "God" means in Greek but it can't possibly how the writer defined it as there was no Trinity Doctrine (formalising of the belief/concept) until 300 + years later.