This makes so much more sense. There is the issue of the EU, though. So it's possible they'll go USB-C and MagSafe (which I hope is the case because I don't want to purchase 6 MagSafe chargers...

I will say that I prefer USB-C over A. It's tighter, can be flipped over and is faster. I'm thrilled Apple went with it for its Thunderbolt - fewer cables, darn good speed and versatility.