Hey, thanks for rating my team!
I tried out your suggestions, and for the most part they work out great, except for the specially defensive Heatran. It adds another Ground, Water, and Fighting weakness which it's not good to have too many common ones floating around.
After some playing...