I say banish ODI's altogether. With the advent of T20, the place of ODI's is neither here nor there. It's not pure entertainment nor is it an ultimate test of cricket skills, T20 performs the function of a ODI in terms of generating revenue and capturing a wider audience, even if it majorly hampers the balance between bat and ball.
May as well just have all the major 9 cricketing nations having a solid 8-9 months of Test cricket (that's right NZ) per year including tour games and the rest of they year can be spent on various T20 leagues, T20 WC, T20 Champions League etc. which can generate income for each home country, so that it can compensate for lack of ODI gate receipts.
I know the TV guys want ODI's because they can place 100 ad breaks instead of 40, but meh, screw them. The game of cricket should override their financial desires.
Some sort of redistribuitive marginal tax rate (can't remember what it's really called - its been years since I done econs) income system should also be looked at, where the more wealthier boards (read India and England) are taxed at a higher rate to the ICC, who redistributes that excess money to the countries with a minnow financial status (NZ, Sri Lanka, Pakistan, BD.) Hopefully the major boards have enough money to support the players, and Test cricket remains the pinnacle.
NB: This will probably never happen. But I think it should...