Ended up being offered a complete BCA upper for a price I felt was reasonable, so going that route. Should have this together in the next few weeks hopefully