Pat
The fact that your getting motor clipping means you need to change more than just parameters. The higher voltage of a 4s lipo would get you to fly much better or you could reduce the weight of your quad.
How much does your quad weigh now?
You may have motor clipping because of how your ESCs a calibrated or the settings of the M4. Clipping means your motor are run at near full throttle just to get off the ground, so not much is left for control of the quad. It's best to not go over 50% of full thrust in order to hover.
The blue number is probably a good number to start with. The red number will probably need to be reduced. None if this will help your major problem, motor clipping.
One of the developers on this forum works for Airbus and he told me that big planes are easy to build but quadcopters are hard.
Larry