AWS charging for IPv4 will help with the former, because companies now have more of a reason to care about IPv6. But it might delay the latter, because fewer IPs wasted on internal servers means less price pressure on useful IPv4 use by ISPs, giving those that still hold out less financial incentive to change anything.