I am so over Q.
I just can't imagine anyone else besides John De-Lancie playing Q, and actually making the part enjoyable to watch.
The next story should be an arc involving the Klingons. STID set that up. Having Q, the re-imagined Borg, and/or Khan in Trek 3 would be overkill and garble the plot up.