So, I didn't get any responses on the X1 vs X2 caps, so I put the X2 caps I had into the PSU when all the other caps came in. (I'll swap them out when my X1 rated ones come in, but I figured if the machine can survive a full meltdown of an old X1 cap, if the X2 cap blows, it should be fine...