Sounds like you are doing fine so far!!
Good idea to "stop" the humping when you see it...I consider it the same as "bullying" in the playground!
Some say that not letting your dog mark every blade of grass on your walks can help..(just let the dog pee at the beginning...then keep walking)...as well as walking in different areas/neighborhoods....so they don't get overly territorial.
Sounds like you have a great dog!!