I can vouch for them both--
I see myself having the motivations of both my wings, and the 5 has shown itself more visibly throughout my life. I've observed the same phenomenon in others I've known and studied--you can see the characteristics of the surrounding types. Sometimes a wing is more apparent, but we do reflect the psychologies of the surrounding types.
I'm also a major proponent of tritype. It's dead-on accurate for me, and again, I've observed it in others I know (or have read biographies about, etc). It actually serves to answer quite a lot, so I will continue to use it.
(I am, however, still incredibly annoyed by the instincts and by Myers-Briggs.)
Anyway, count me as a vote for "both".