Have you tried squeezing the levers without the wheels in the frame? If you do this carefully you can adjust the pad gap to get brakes to engage much faster. Just take the wheel out, and squeeze the levers while keeping an eye on the movement of the pads. You will see the pads don't do back as far as they did. Put the wheel back in and see if the pads engage faster. If not, repeat the process... Since I found this method online the braking on my bikes with hydraulic disc brakes has much improved...
Well this was a success, though my ham-fisted initial attempts were a fiasco. My nearest and dearest are all covered in hydraulic oil and there is an oil slick in the garden but hey ho.
Lever feel is much improved, though i think my rotors and or pads are contaminated as stopping power is pretty mediocre. I've given everything a good clean so will see if there is an improvement, if not ill get some better pads in.