I think you are good to go. I agree with Copycat, you probably should run liver support. Run some Milk Thistle, NAC (bulk Nutraplanet is a bargain), and a good anti-oxidant for the liver.
Me personally, if I ever run the Havoc that has been sitting in my stash the past year, I will not run an AI. The Nolvadex is going to protect your breast tissue from interacting with estrogen and help kick start your natural test production.
In my opinion, I think it would be best to let estrogen naturally normalize while your protected by the Nolva. I think when you lower estrogen exogenously with an AI, you risk estrogen rebound once the AI is discontinued. The AI may lower estrogen to an unnatural level, and your body will then try to normalize it and may overshoot estrogen production at the worst possible time (end of PCT).
Some argue that if this was true, AI's would cause an estrogen rebound whether used in PCT or in a solo run. I have never heard of anyone getting gyno from a solo run of an AI. But I think in the context of PCT it is possible because your hormones (including estrogen) is completely off kilter.
If you do use an AI, start it in your second or third week of PCT and bring the dose down slowly to minimize the risk of estrogen rebound.
The only natural "test booster" I would consider in PCT is USP Labs Powerful or Applied Nutriceuticals IGF-2.