Here is a tip that might help, that I'm just now learning. Since you're also an organist it may be a little easier for you. Don't get caught up in too much theory. Make sure that you are playing what you hear. I'm learning to just close my eyes and react to the music and totally eliminate any thoughts of scales and patterns. As you play all that theory stuff you learned kinda just comes out. Make sure you do learn the theory but don't let it limit you when playing.