I replaced my integrated shifters with these Shimano SL-M360 3x8 shiftersFor sure I got new brake handles, not sure if they included the mag-switches for legacy handles or not. I think I'll use them anyway, just get new shifters unless they're costly. Shopping now. This will make it easier to fit everything on the bars as well. And yes, thumb throttle for sure now.
Shown here with brake, shifter, and thumb throttle.