True about the scuba diving aspect. Lots of training to be efficient at that. The Mechanic is a boring movie overall. Charles Bronson's stoic personality can't really get me excited enough (need to see more of his stuff though), but he did one good movie called Hard Times:
https://thecineviewer.com/hardtimes.html
For tons of movie reviews, 60+ genre lists, best of the year lists, and other content, check out:
www.thecineviewer.com

I always kind of liked it but now you bring up a good point of why Jan wasn't killed or something else done when Chuck found out he was a target.
As for them scuba diving, when did they learn that?
One has to take many hours of classes and be certified.
They can't just strap on a tank and go underwater.
Yeah, wrong title for a guy who never fixes cars.
Instead he blows them up!
Dude, if you don't want to work on it skip the drama!
"Please vote to preserve the unique character of Warren…" - Robert Duvall