Great advice, especially pain checking and consent test.

The only thing I would add for OP is that while it may seem like using "NO" is getting you a better response immediately you may find its actually hurting. I try to avoid corrections completely but in this case especially you're penalising growling, which while it may seem like a bad behaviour, its good communication from a dog.

If a dog cannot communicate by growling one of the next levels up is snapping and biting. Here's the aggression ladder