Handheld or WML on M&P shield

Switched my shield 1.0 to a 2.0 4 inch. Just started using lights on my larger handguns recently. Streamlight TLR1 800 lumen version which I really like and getting a Surefire x300 the end of the month. I carry an M&P 2.0 compact with the Streamight and really like it. and have no trouble concealing the pistol. I bought a Streamlight TLR6 for the shield and played around with it, I didn't like the push button activation at all it made it hard to properly grip the pistol plus it just felt cheap. which maybe it is because it promptly stopped working after 20 minutes or so plus the light kept going off with dry firing. Thinking I might forego the pistol light on the shield and just carry my handheld light. Anyone else try one of these and become accustomed to it?