You gotta learn your scales at some point. There is no shortcut and you just have to slog through them until the patterns feel natural to you.
This video is a walk-through of one of my most used exercises for mastering new scales. I apply this basic structure to whatever scale I need to master because it provides me a pattern in which to practice all the shapes in one key, in a single exercise.
If you spend some time with this I think it should help… At least that is my hope. Cheers! Practice away and tune in next time for some more ideas.