You do not consider IPv6 an option?
ipv6 is working just fine even here at IETF49 venue, it's so much more
convenient than IPv4, for couple of reasons.
We can't use IPv6 until multihoming issues are properly solved
and global routing table size and the number of ASes are
controlled to be below reasonable upper bound.
IETF is intensively working on the issue that a new WG (multi6) will
be created to draft a framwork document.
So, you can expect lengthy framework document effectively stating nothing
more than that the issue is hard, within a year or two.
Well, I have a solution. But, last time I tried this kind of thing
(proposed that subscribers be assigned /48 IPv6 address ranges or
renumbering and other things are too hard just before IPv6 went to
PS), it was rejected with a reason that it is too late.
As you can see, 5 years are wasted until IAB and IESG make the same
statement that assignments should be /48.