I like Test Prop because it's in and out of your system quickly so you can keep the cycle 8-10 weeks. That's the way I would roll with it. You can go anywhere from 250 to 500 mg a week.
I think Fenugreek and Tribulus are a great stack but you should run them a minimum of 1000 mg each per day. That will bring you the best benefits and you'll have some amazing results.