Optimized 2-opt now seems to be working.

~16 points in 0.38 s on Kattis.