Looking much better.
Give the driver transistors a bit more current. Instead of R3 and R4 out to the rails, use small (220-ish) resistors from Q3 and Q4's emitters to the output. (There'll only by 0.65V across the resistor, so it won't draw too much current).
If you didn't have the driver transistors, VBE would be 0.65, and VD would be 0.7V, so you'd actually have a bit of extra bias, completely eliminating the crossover distortion. With driver transistors, though, the accumulated excess bias usually ends up being too much and the quiescent current will be too high (if you use the equivalent of four diodes for four transistors). I suggest using the attached circuit to give a variable voltage drop, rather than a series of diodes. Make R7 a trimmer. This will hold a reasonably constant voltage across it, continuously adjustable. If you thermally couple it to the output transistors, again, it will drop the bias in case of excess temperature.
If you're careful with your computations and use 1% resistors, you may be able to eliminate the trimmer as well.
I wouldn't remove the protection resistors if I were you. The op amp will compensate for them and they'll prevent the output from ever being a dead short.
Your output is clipping because the gain is way too high. You're trying to multiply a 0.55Vpk sine wave by 17.9, giving 9.8V, which you don't have the headroom for. Reduce the gain or the input amplitude. (Or increase the power supply if you truly want 12W output into a 4 ohm load.)