Two things about this:
- did you look at this: Perception Based Contrast Enhancement by Majumder? I have no experience with it but it seems quite feasible and logical.
- What is the basis of your shadow-highlights tool? is ot a masked, blurred and inversed copy of the image?
Cheers
Stephan