I make my own ZMA. 30-50mg Zinc Picolinate(Thorne), 300-400mg Magnesium Glycinate or 144mg Magensium L threonate and I leave out the B-6 at that moment. I take B-right earlier in the day. These are superior forms than what is patented in ZMA's which is an obsolete formulation in my opinion.
According to Andrew Huberman, Apigenin @200mg and L-Theanine at 200-400mg is amazing paired with the Threonate. This is something I am trying - as I always have about 200-400mg Apigenin from A-bolic and I just ordered L-Theanine from Jarrow and Doctor's Best.