Once Hardik is fit, I'd play:
Rohit, Gill, Virat, Rahul, Hardik, Surya, Jadeja, Shardul, Shami, Bumrah, Kuldeep
Come the semis at small grounds like Wankhede/Eden, IMO Surya adds a lot more value at 6 than Shreyas at 4, and Hardik is good enough to bat at 5.
Thoughts?