ONE: Yes. Good choice. Better safe than sorry.

TWO: That's exactly what I'm saying. If I were you, I'd get both now. I don't think X2s are going to get much cheaper than they are now.