I have finally decided to replace the shifters.

I have an old set of SRAM MRX Comp 7 Speed Grip Shifters mounted on trekking bars,
Front Shimano Deraill (model ??)
Rear Shimano ACTUS deraill.
Shimano Alvio Triple Chain rings

What would be a good model grip shifter to use?
What about a trigger shift instead? Model????

The hardest part about doing the work is getting the right parts.
Would the new shifters come with both cables & new housing?

All help appreciated ( intermediate mechanical abilities)

Ed