Who says they aren't doing both? I think you'd have to be naive to think otherwise.They should focus on emerging battery technologies and rather than trying to fit as much battery as possible into the design.
That "3-5 years" period will remain the same if a large company like Apple don't invest in some of the new battery technologies.