It sounds like you figured correctly. You could put more than 10g of 1T/4AD per bottle but you'd need to order more powders than you mentioned. Some people prefer a higher 4AD/1T ratio. I think 1:1 ratio is just fine. Also, I wouldn't wory too much with ZMA unless you just have extra money.