I don't have any problem with my honey dissolving if I pour half the bottle with water first, then add the honey, then add the rest of the water and shake immediately. That way the honey doesn't get a chance to stay at the bottom of the bottle and get too attached. I was doing the honey first the first couple of times, but it was taking me longer to loosen it from the bottom. And like you said, adding a drop of condish can help.
Hope you have a great hair day! I can't wait to see the good pics!