New York technically has an independent commission for redistricting although it might not be so independent if the Dems set it up properly. Here's how I would redraw upstate NY if I was drawing the maps. The only incumbents running against each other are Stefanik and Tonko.

Tom Reed's district has some large changes. Instead of going to Lake Erie, his district now borders Lake Ontario. It takes in Ithaca where Cornell is located, which helps to bring it from R+6 to R+3.

Anthony Brindisi would be massively helped out if he survives 2020, his district is now D+1.5 and takes in Syracuse. I paid extra attention to make sure John Katko's town stays out of this district.

John Katko's new district takes up where Stefanik's current district is. This should help him out as it goes from a Clinton seat to a Trump+4.8 seat. I drew it this way partly because I don't like Stefanik.

Both Paul Tonko and Elise Stefanik would be the biggest losers in this new map. Tonko's district goes from D+7 to D+4.4 but if Stefanik decides to run here, he would have a large advantage because most of this is familiar territory for him and new territory for Stefanik.

Stefanik could also decide to carpetbag again by setting up a primary against Katko, although she would no longer live in the district.

And finally, Delgado's district gets shored up a bit, it now has a PVI of D+0.32. The district doesn't change that much except for a new arm extending to Binghamton.