You are doing everything right AND you are going about it in the right way! What I should suggest is that you get some good books and videos on clicker training if you would like to have it a try. There are also seminars that come through our area I can give you a heads up on. When I get a chance this week, I'll compile a list of clicker training books and videos and where to get them. I can make it a seperate post (I may have made such a post in the past but I don't remember). OK?
Keep up the good work! : )