Of the two, probably the Xperia X Performance just because the S6 has likely lost software support and probably won't have the battery life you want. You may also want to look at newer mid-range phones like the OnePlus 5 or 5T and Motorola's lineup.
Is it true that sony x performance has problems with overheated camera? (supposedly it is a phone that gets very little heat but very much when recording)