So, after further testing, I've added the diodes before Q2 and Q4. I'll probably keep'em, or at least make them switchable.
I've tried your suggestions on the 2nd stage and decided to remove the cap altogether
Finally, I've decided to use a 1k in series with a 1uf cap in the 3rd stage, in place...