>Most of the theorems still fell like digging a pool with a spoon. Fermat's last theorem was finally proven, with a lot of effort and diversions.

The Fermat's last theorem equation was an incredibly difficult edge case that is illustrative of very fine boundary of a grand theorem. In the case of FLT, that was the modularity theorem.

I wouldn't call anything put towards proving FLT a diversion, the modularity theorem and other theorems that came as a result of proving FLT are the 'basic' (but complex) discoveries that these problems yield.