To me the 11 Pro Max is better in every conceivable way ... so there's nothing to worry about. I wouldn't downgrade back to the X if you paid me.
Same here. Massively better battery and night mode are wonderful additions. I've actually found the third lens very handy for situation where I can't back up but want more in the shot.