Yeah, I too think that's likely the direction we're heading, and I'd be fine with either option as long as it was consistently used, this transitional phase is just painful.
In the meanwhile you can say one thousand millions (for what Americans call a billion), like the local tv news does, and for the bigger one say just say millions of millions (what Americans call a trillion), that should be unambiguous enough.