Have you tried a spray on detangler? I used to use that on my Lhasas when I kept their hair long.