TS, I had the same problems with shedding on finasteride as you. you might want to lower your dosage of finasteride or switch to dutasteride.
The best results I had with antiandrogens were 2 weeks heavy shedding on finasteride, exit for a 1,5 month, switch to dutas, 2,5 months later all hair grown back and got some...