To be fair, he has made enormous improvements since I got him.
I can't help you since my own 7 year old still behaves badly around other dogs but it sounds to me like you have made amazing progress! The situation is not optimal and to have come this far I think you need a pat on the back.
I hope some others will have some answers for you but I just wanted to say that I think you're a special guy for taking on such a challenging pup.
Lynn and Traveler