This is so similar to my journey but 18” for me. I started with a Faxon match barrel, swapped to a Douglas PRI which made a nice jump in accuracy and I just received a new upper for a thermal fit.
I have an MDT SCS on the lower, which I don’t like, and I recently received a B5 precision stock...