4 groups of 4 is perfect, give a toss if India goes out - it's not like the ICC need the money that desperately! Also surely they negotiate broadcast/sponsorship deals in advance, not as the tournament progresses?
Afghanistan coach made an excellent suggestion about warmups - every team touring UAE to play Pakistan should play warmups against Afg, likewise England/Ireland/Scotland etc. Repeat that around the world and it's a good start at least, then hopefully the associates can progress faster. To be fair to Australia, at least they've been leading the way in making a habit of playing Ireland when they're over here.
Also - maybe a controversial thought but why does cricket only allow certain teams to play tests? FIFA doesn't make smaller footballing nations play 5 a side until they're good enough to step up, why do we not let other nations play tests? So what if they're not good enough to play the top sides, it's not like Zimbabwe and Bangladesh are anyway.
Unfortunately it seems cricket really is no longer being run with any thought towards the fans, cannot believe the ICC didn't apply to have cricket in the Olympics (imagine that!). New Kerry Packer figure needed please.