In 6, we won't have a query translator as we either expect the user to use the DSL or to use Elasticsearch-specific JSON queries.
In 5.x, we can't improve the situation as it's entirely blocked by the Lucene versions we have to use.