Moving from Corporate Finance to HF

Hi everyone, sorry in advance for the long post. I'll put a TL;DR at the bottom.

I'm interested in changing gears from Corporate Finance/Corporate Development to investment strategy at a HF, with the longer-term goal of becoming a PM. I'm currently 24. I'll give an overview of my education/work experience, and then outline the next steps I think might be prudent based on my own research. I would really appreciate if people who are in/knowledgeable about the industry could comment on my plan, and maybe provide some alternative ideas.

I graduated from a Davidson/Washington and Lee/Duke caliber school in 2016 with a B.S. in Physics. I had a woeful (~2.0) GPA, which stemmed from serious maturity issues. I missed a ton of class and couldn't be bothered to turn in assignments on time, if at all. During the summer between my Junior and Senior years, I got an ER internship at a small shipping and oilfield services focused bank. Got along great with the guys in my group on a personal level, but didn't get a FT offer (again, have to imagine this was due to maturity issues).

It took me almost three months of living in my parents’ basement before I realized what a fuck up I had become. I was an honors student in high school, two sport varsity athlete, and talented musician. I finally got my shit together in late 2016 and found a job in Houston working for a small offshore oilfield services company. I started as a project engineer, doing a mixture of cash flow/vendor management and project management support. After 8 months in this role, I convinced the VP of Finance to let me work under him as an analyst, and have had a great upward trajectory since then. Our company was purchased shortly thereafter by a much larger oilfield services company, backed by a highly acquisitive family office. My current role splits my time between tasks at the operating company (lender reporting requirements, internal projection models etc.) and new investment research at the parent company level (financial and operational due diligence, attendance at company management meetings, asset valuation...). From this experience, I have realized that I genuinely enjoy the due diligence process and coming to my own conclusions about the valuation of a company or of a particular asset/vessel. I would like to utilize this skill set in an environment where I can help create a trading strategy.

There are two courses of action that I could see pursuing to achieve my goal:

1) Take some local undergrad courses to improve my GPA, learn some Python, go back to school for an MFE and try to get an internship at a fund
2) Stay in my current position for the next year or two, get an MBA, change careers to investment banking and try to get into a HF from there.

I’m happy to clarify anything that is confusing in my post, and thanks to everyone in advance.

TL;DR: Graduated from good school with Physics degree, horrible GPA, working in corporate finance and want to use due diligence/modeling/valuation skill set to create trade ideas/strategies at a HF.