RE: 7.2V high discharge vs 8.4V??
Use IB or EP brand cells from a good matcher with the highest numbers.
The rating you are looking at from the generic battery manufactureres is the max recommended rate and is usually 10C (it is pretty accurate too) the battery will do a good job and hold up ok. The rating from a reputable matcher is the rating at which the cells were tested and labeled. The good cells will hold up to far higher currents than the "matched" rating.