That's a great question about counting rhythms! I looked at your counting addition/edits to the "I Wouldn't Want To Be Like You" solo and it's perfect. Good job! It looks like you are on the right track, so I recommend continuing to count out any piece of music you are working on to improve the skill. A good overall guitar method that addresses rhythm counting in all the exercises is the "Berklee Guitar Method."
I hope this helps!
-Dave