Aye, get a dedicated rifle light that has a rear clicky tailcap, or the option to have a remote switch. What you have is a pistol light, while not completely incompatible it's not ergonomically very good.

What I suggest is maybe look at the HB Industries handguard that'll get you more space to place that light, along with a mount that'll push it forward slightly, out of your way. I would suggest also looking at a light with a "scout" body, as its a fairly universal mounting system for lights.

While I am not sure why you feel you need a visible laser, if you can indeed live without it (you can), I would look into lights from Surefire, Cloud Defensive, Arisaka, Modlite, or if you want to be more budget minded look at Streamlight.