disabling overcommit does not fix trashing. Reducing the size of your swap does.

Yes, but not fully, it may still thrash on mmaped files (especially readonly ones).