I have 35+ Platy in my 20 long, so you're not over stocked yet.
I agree, keep all males or make sure you have 3x girls than males. You also need to give them hiding spots.
Leaving the hobby failed, sorry. Should of known better.