Yes, you should be on finasteride/minoxidil and should have been on it long ago. If you're getting side effects from oral finasteride, use the topical solution. I use Morr F which is a topical combo of finasteride and minoxidil and there are multiple studies proving its efficacy (see my prior posts). For you, I would try oral finasteride and topical minoxidil. If you're getting side effects from oral finasteride, switch to topical finasteride.
Feel free to PM me if you have more questions. All the best