Either one should work out for you, I cannot decide for you. The recent experiences at Buffalo have been fairly good compared to that port historically so that may not be a bad choice.
I only cautioned you about JFK since there could be an ignorance factor at work there. You have an equal probability of being approved. It is always nice when an ignorance factor goes in your favor but when it doesn't, that is not a pleasant surprise. And of course, the internal U.S. airports see way less
TN petitions compared to the Canadian PFI's so obviously a greater chance of someone screwing up an adjudication. Good luck.