Keep the warrior at 60m. Add enough to get 75-80% of your desired IBU. Consider using hop extract (hops shot, etc) for this.
Drop the 20 min addition.
Squeeze the rest of your hops between 10 and 0 mins, then do another 1-2oz whirlpool addition for 30 mins after cooling slightly.
Then double...