Ugh a lot of work needed here but yeah if your willing to put in the time you can fix it. First off I think gentle leader and such are crap! Others can disagree but that's my take sooo... in that regard I'd say your first step is dump that trainer and find a good one!
In the mean time:
I don't do the clicker myself but others have reported good results using it.