Well, got lucky. The FFL that I had my lower shipped to got a shipment of PSA stripped uppers in while I was there chatting with them. So I was able to get a matching upper for my lower. Now just need to get the rest of the parts + the tools I'll need.
Unless budget is a hard limit, I recommend the magpul wrench and upper insert.
Wrench $59.99
BEV Block $39.99
Other tools you’ll need are punches, and a way of starting the roll pins.