Not quite given up hope yet on my S6.
Next tests will be with some yet again different cells.
Also testing with some more different props and also different motors.
I am sure this is pulling far too many amps for the size it is.
So will be updating soon to see if any of these mods makes much difference to the crazy short flight time.