Even with the "performance issues" reported the 5X all the way. 6P is just too big, the 5X seems just right and I'm sure it'll get worked out as Marshmallow moves along.
I'd take a 6p. My current phone's screen cracked several months ago and I can't really afford a replacement. Might as well go with the best of the best.