I have heard that tribulus can actually keep your natural test levels from returning as quickly. I have not researched it, but I'm sure you can find some info this. Its best to use on-cycle or in-between cycles IMO. You'll be fine with just the Clomid. I'd use the Tribex after a month or so before your next cycle.
ZMA should work for you. I personally don't like because I break out from it.