OK. Updated everything in the OP.
I took away the 90 minute hop additions and moved the simcoe to 20 minutes, adjusted the mash temp from 152 to 150.
As for what I am looking for in this beer...big bodied, slightly boozy, with a lot of citrus and pine aroma and a its sweetness to marry well...