I had the same non-rectangular setup that you have, with the same crappy OEM headlights. I replaced them with of set of the drop-in 5"x7" LED headlights off of amazon (
link). Pulled the plastic rectangular housings off of a van in the junkyard. Cost less than $100 and took <2hrs to do the swap. Super straightforward, just need to crimp a few wires.
High and low beams work wayyyy better than stock. I'm super they aren't as good as the other pricier options mentioned here, but for <$100, they did the trick for me.