I did end up adopting the Trinitarian viewpoint...although, there's not much difference between it and Oneness. I did not feel comfortable using the terms "person" when referring the Godhead, but I found it easier to reconile certain scriptures to a Trinitarian viewpoint than oneness.
I have...