I think I agree, except I believe you should move Jehovah up to the Father. My feeling is that the concept of the Holy Spirit was developed to make God more loving, more in line with the New Testament. The Old Testament God was a nasty sumbitch, visiting plagues and floods and all manner of nasty surprises on people.
Hmm... kind of like what's happening now.