I would definitely choose the XL over the original. It just feels like a better build than the first, and the bigger screen really helps the 3D experience.
To be honest, if I bought a Wii U, transferred all my stuff to it, and then it broke, I would send it to Nintendo, not take it back. Just seems a little silly to me that he would take it back.