It sounds like you are experimenting and are finding success. Congratulations! The important thing is that you are enjoying the tea and learning as you adjust, it seems you are.
You can also brew this tea in a taller style glass, "grandpa style."
In a teapot I seem to use a 1:1 ratio (grams leaf to ounces water) as the starting point for a new Chinese green tea to the fold. And around 60-120 seconds ... usually 90. to start. I know some members go hotter and some go cooler. I think this has a lot to do with personal tastes and sensitivity to bitter.
Since I preheat the brew vessel (AND smell the dry leaves warming in the brew vessel), I use slightly cooler water, starting with 160*. If I do not preheat, then 170-175 seems reasonable. I only put the dry leaves into the preheated vessel shortly before the water is at the desired temp.
You are using more leaf, and less time ... so go the ebbs and flows of tea brewing. You can alter one aspect which then usually triggers an adjustment elsewhere.