Its too early to make changes now. There is a ton of education that must occur for a delegator to get started, and begin making informed decisions. Its not unreasonable to expect them to spend a few extra minutes to learn how query fees work. I think this problem of confusion can be readily solved by more transparency and education (eg. effective cut).
It was designed this way for a reason, to be very flexible, so I think we should at least give it a chance to let it play out, and figure out how we can adapt it to our own liking.