You are getting close, but not quite, in my opinion. I like to allow them to finish as much as possible... basically until the plant quits growing or begins to foxtail. The idea behind the Trichome ripeness is to maximize the THCa, with over ripe THCa turning to CBD the longer it goes past the optimum time. This is true, but the difference is tiny and not likely to be felt and mostly appearing using chemical analysis. The difference between two plants/strain grown from seed is MUCH greater than the difference in THC/CBD levels from over ripeness. I also think most of the flavor and oils seem to increase more the longer a plant flowers.
It is my opinion that it is much better to let them go until they are done without a doubt than to harvest early. Heft and flavor seem to develop mostly at the end of flowering... or at least this is my observations.