I do say that Emma sending all the X-Men gift baskets was a nice touch.
I'm not sure. She teases him about making him absorb energy until he explodes and the last shot of him is his body with his head conspicuously off-panel and some red splotches, but I think he's fine?