Definitely in the same boat, need an upper assembled. Don't trust local shops at all. If money isn't an issue try classic precision gunsmithing. I'd love to give him my business but was quoted 120 for upper assembly. If you're comfortable sending your stuff off try
https://www.adcofirearms.com/ Theyre huge on ar15 boards, and no one has had any issues that I know of. Upper assembly is ~40 there I believe.