American Pale Ale Citra Pale Ale

I'm working on a new pale ale recipe. This is the first time brewing with Citra. I'm trying to decide between Amarillo or Magnum as a bittering hop. Below is my proposed recipe any thoughts??

Amt Name Type # %/IBU
11 lbs 14.7 oz Pale Malt (2 Row) US (2.0 SRM) Grain 1 80.6 %
1 lbs 1.7 oz Victory Malt (25.0 SRM) Grain 2 7.5 %
11.9 oz Munich Malt (9.0 SRM) Grain 3 5.0 %
11.9 oz Wheat Malt, Bel (2.0 SRM) Grain 4 5.0 %
4.7 oz Acid Malt (3.0 SRM) Grain 5 2.0 %
1.00 oz Amarillo Gold [8.50 %] - Boil 60.0 min Hop 6 29.9 IBUs
1.00 oz Citra [13.00 %] - Boil 10.0 min Hop 7 9.1 IBUs
1.00 oz Citra [12.00 %] - Boil 0.0 min Hop 8 0.0 IBUs
1.0 pkg California Ale (White Labs #WLP001) [35.49 ml] Yeast 9 -
2.00 oz Citra [12.00 %] - Dry Hop 6.0 Days Hop 10 0.0 IBUs

I did a Citra Pale Ale a while back that turned out amazingly! Here's a link to the recipe. It took 1st place out of 19 entries in a competition, and took 2nd in another. The only bad remarks I got were for a "garlic/onion" flavor. This flavor wasn't noticeable when the beer was green, but as it aged a little bit, it became more prominent. I used Columbus for my bittering hops. I'm not sure if the garlic/onion flavor came from the citra, or from the Columbus. I love the flavor/aroma of citra, so I definitely would keep that, but I would consider a different bittering hop when I brew it again. Magnum might be a good choice, I had thought about using Chinook as well.