If 500mg gives you the results you are pleased with...stick with that dose (I'm guessing you ran your first 2 cycles with at least 500mg of test). If I was in your shoes and this was my third cycle, I'd probably aim for 750mg EW. IMHO.
As for the tren, wise move going with ace and not enan. Suggested dose varies from person to person. Have you ran tren in the past? If not, start with a low dose to see how your body reacts...if all goes well, you can slowly bump it up. 100mg EOD is a nice dose for most. I'd get some caber to....
/V