Well, if you are bent digging back up your non-thinking 'natural' stroke, practice speed pool with a house cue. It works better playing with a rack of 10 balls, shooting the 10 ball last, not a full 15-ball rack since you'll likely have to pause too long between shots to figure out any problems that pop up. Slam a beer between racks.
Of course, if you've developed any stroke habits that are actually useful, you may want to stick with them. Work with an instructor or even just knowledgeable pool buddy to watch you and draw your attention to when you're switching things on the fly so you can stay consistent as you practice. Consciously lock yourself into the stroke that works for you and towards the end of a practice session, start playing faster and faster to force yourself to get into form as quickly as possible on each shot to ingrain it into your muscle memory, then it shouldn't be switching on you in the middle of a match.