What about the iPad? That has a massive battery!
Plus it would make thunderbolt more relevant + free up USB space.
It is too soon to be swapping to TB right now. If Apple really wants to piss off the customers that don't feel the need to buy new tech once or twice a year then sure, do it. Otherwise, they need to sit tight with USB for now.