There's a startup to be done that will make IP itself meaningless; what we need is a generalized, bidirectional overlay datagram service (think: Akamai, but for packets, not files --- or, Akamai crossed with Skype) with abstracted addressing. We tried to build this in '99 but failed for want of a killer app for the service (also, we failed because our VCs installed management that felt our best bet was to take our series A and try to compete directly with Akamai by building colos).
This is, I think, the long term answer to both network neutrality and the IPv4 address crunch; IP could be relegated to a similar long-term role as Ethernet.