Help specifying suitable brake calipers (hybrid bike)

Hi Guys 'n' Gals

Slight dilemma. Looking to exploit your knowledge as I have been out of the cycling game for years.....

I have a hybrid bike, using for work. The bike has Shimano BR-M395 calipers on it. These have always been a bit pants (at least compared to my MTB which has 15 year old XT calipers on it that are still flawless, but I suppose that is to be expected). The calipers are leaking from every possible orifice which renders them pretty useless as the discs are covered in oil.

I want to keep the levers but replace the calipers. After reading about these particular calipers elsewhere (prone to leaking even when out of the box) I'm not sure where to start with speccing in a replacement set. Please help.

I want to stick with Shimano so I can use the existing levers. Also, these brakes are about 5 years old, I want to stick to whatever the price point would likely be in today's money. I'm thinking "scrap these trekking brakes and stick some decent MTB brakes on it and be done with it". What would be a good solid reliable economically priced option from the MTB range?

Happy to purchase old stock to get a bargain. No requirement for these to feature the latest mod cons.

Thoughts?