I can only speak from my experience. When I increased my test to 800-1g the estrogen side effects were quite bad – cysts through oil build up, estrogen was bad even with an AI.
I would keep the current 500mg p/w and just St07 yours diet around the gains you want. Cutting – carb cycling works great, eating small nutritious meals every 3 hours to ramp up the metabolism.