1. Pathan should be included because, it will give a depth in batting as well as bowling.
2. Depending on the pitch conditions Kumble or Agarkar can be picked. If the pitch will support bounce/swing then Agarkar should be picked. He also should be sent as a pinch-hitter in one-down. Ranathunga tried with Kaluwitharana and it worked marvels to them. As we see most of the games played in WI are low-scoring ones and 20-30 quick runs will be crucial and since we have depth in batting, Agarkar's presence down the order won't be of much anyways.