Mike,
Wish I could give you a definite answer about the current draws for gellcells, but I can't. I'm pretty sure that there are 'formulas' out there, just haven't found enough need to find them yet. A very, very rough rule of thumb is that if a gellcell doesn't last for more than 15 minutes, something "ain't right", at least for the boats I've built (limited).
From what you've said about the motors getting hot, I'd think that the props may be just a 'shade' too much load. If the ESC is warmish too, then it's definnitely getting close to 'too much', the whole system I mean. If you can 'adjust' the pitch on your new props, I think I'd make then a bit 'finer'. I also wouldn't put much faith in my opinion...
- 'Doc
PS - You always have the alternative of beating the @#$ thing till it obeys!