I agree with toning down the crystal.
I would wouldn't use the partial simcoe and Amarillo in the 60 min. I would use more warrior to get you to your desired bitterness and save the simcoe and Amarillo for flavor/aroma additions.
FWIW- I try to make my hop additions equal to round ounces as...