No you have left out poor bowlers.
The team can be formed in 2 ways.
1. 6 batsman, 1 keeper, 4 bowlers in ${9 \choose 6}{ 2 \choose 1}{ 5 \choose 4} = 840$
2. 6 batsman, 2 keeper, 3 bowlers in ${9 \choose 6}{ 2 \choose 2}{ 5 \choose 3} = 840$
So total number of ways = $1680$