I think you are approaching this in the correct manner. I hesitate to give you specific suggestions because I think there are many ways to get good results. Your numbers are in the ballpark. I have two things for you though, both found right here on future4200.
Read every single post made by @emdub27. I’m so grateful for his posts and I wish he would bless us with more of them!
AGT-50 makes weed taste better imo. Subtle but worthwhile.