You probably know this already but I will say it anyway, because it always applys and I do this myself with any tunes I am working on. So with the chance of stating the obvious......I pretty much learn a tune and there are often the odd few bits that just don't work as well as the rest at first and what I do is go through the tune and just play all the parts that I think are a bit sticky, I don't play the bits I can play, just the junctions and bars that are problems. I play into the problem bar and out of the problem bar over and over again. really slowly. I usually finish off playing all the way through, once, twice, or sometimes a lot more. I know you know this already, but if you think there are areas not so fluent this works for me.
I actually think you are well down the road with this tune. Keep up the good work!

Tom N.