Thanks.
In retrospect, perhaps 3 seats in Y would have been better. Maybe once we board we'll head back to Y and find a couple and ask if they'd switch spots with us. Probably not officially allowable, but could be an option.
You should be fine in Envoy with the baby
Seats actually recline enough so you can sleep. No need to switch. Perhaps there might even be an empty seat in Envoy so you can managed to score 3