HI
You have not given a breakdown of the % of income employer is paying into both pensions pots ,your contribution and AVC amounts,
With the kind of savings you have you need to be maxing them out,
if I was planning to retire at the age you plan to, I cannot see where I will get a better return...