Optimized 2-opt with buckets