I am not familiar with this flight, but depending on the plane layout, would you consider purchasing an extra Y seat on the way back? Gives you a little extra space.

Also, even on a long flight like this, I would always choose a non-stop over a connecting flight. I don't think an overnight would really help or be that refreshing as you're still in transit and having time issues. You might or might not sleep well.