According to the Force Awakens incredble cross-sections, Poe flies a T-70. The book calls it 'a customsied example codenamed Black One' and refers to the ship as the latest incarnation of the venerable X Wing family. There's no mention of a T-85.
God dammit Disney! You're supposed to STOP making canon conflictions, not make brand new ones..!
The T-85 does indeed exist however.
But it's like the sasquatch.