Alas, the older FX thighs were more normal. If you can't find a pair of them (very rare these days) then trim, trim, trim is your only option for now.
I'd actually recommend when you have some spare greenbacks to order a set of thighs from RT. They should match your armor perfectly and don't have the barrel look that the current FX thighs do.
The AP helmet should fit you fine. Remember that unless you have a very small head everyone puts them on sideways to get them on. I actually have to squeeze mine a little bit too. Terrell's recommendation of trimming the bottom works the majority of the time.