Mosfet LED switch protection
Just some ideas, but you could try the following... 

1 - Replace Q1, D1, C1 and R1 with a single Schottky diode for reverse current protection.

2 - Replace Q2 with a BJT constant current source, for which you could repurpose D1 and R1.

These ideas eliminate two components and any ESD concerns, while providing inherent current limiting.