3-opt now seems to be working.

2-opt still beats it because of its speed (more tours can be tried),
so we need a better general algorithm (Monte Carlo with double
bridge kick move perhaps), but time is running out :/