For the BCM94360CD, did you use an adapter like this one or was it just swapping out the original? https://www.amazon.com/gp/product/B082Y4YPLZ/ref=ppx_yo_dt_b_asin_title_o00_s00?ie=UTF8&psc=1

​

Thanks for the detailed build! I will be trying this next week.