Everyone is going to tell you that you need to run the test e longer to really get the best use of it. Min 10 weeks preferably 12. If you could run option a but run the test 12 weeks I would say that is your best plan. Then say split the IGF so you do maybe 2 weeks of it 3x/week then use the rest in PCT (should have about 3 weeks left of a gram for pct).
What were your results like with Havoc?