An additional thought about Jellico, its not beyond belief that once he established his command style that he would have softened a bit.
He did. Once onboard, he implemented the changes that he expected, dealt with resistance appropriately, & once he removed Riker, who was clearly out of line, everything on that ship was just fine. In fact, the very next scene is Geordi, Data & Jellico putting the pieces together magnificently. He listens to them, takes their suggestions, uses their input, & drives the team to success
Data's info led to them knowing Picard was the target. Jellico deduced the bit about the sector's strategic defense plans. Geordi linked it to Minos Korva. Jellico hatched the offensive, & Worf armed the offensive. It was even Geordi's suggestion that they use Riker as pilot. They operated like a well oiled machine, those officers. All Riker did was pilot the shuttle well, & instead of volunteering he made Jellico grovel.
Jellico: "I won't order you to go on this mission"
Riker: "Then ask"
Seriously? You're not going to volunteer? You already know we need the best pilot we can get, to save Picard & prevent war, & you sit there in your commander's uniform, waiting for someone to come along with their hat in their hand & ASK you if you'd like to do something about it, instead of swallowing some pride the way Jellico did in coming to you in the 1st place & agreeing to drop ranks for the sake of the mission?
In my opinion, you've just now proven Jellico right, & your crew should be disappointed in you