I agree with the above point, celebi and heatran work wonders together.
For better coverage u might switch stone edge on gyrados with bounce or return to handle celebi (although covered by heatran) and bulky waters better, bounce also gives more leftovers recovery and can possibly lure in...