When it comes to tren, you can run anywhere from 150 to 400 mg a week. I've seen guys run it higher but I don't think it's necessary in your situation. Stack some T-bol with it or proviron.
Test prop is good, but I would switch to test E. I would do it with some NPP and keep the dosing on both around 250 to 300 mg a week, then run proviron with it.