I think next time ICC should consider 3 pools of 5 teams, the top 3 of each pool will proceed to the (Super 9) and carry the win points through as per normal. The teams will only play the other 6 teams from their opposing pools. The top 4 teams of the Super 9 will be the semi finalists.
I expect it to look something as follows. (based on current rankings)