New to Fiesta St, Strut Bearing Mount Advice KYB/OEM

After owning a Focus ST for several years I now have a 2015 Fiesta as well. Purchased as a clean used car with used car problems.
The front end sounds lie it is departing the car over any bumps. Determined it was the drivers side strut bearing, as seen in this video.

https://photos.app.goo.gl/AqHLjc3LpRNtAAVx5

It has a set of quick struts on it, and I want it back to OEM style. I am going to get OEM ST sprngs (they are cheap) and I think Bilstein B4's. I have researched a ton and I know the front struts and stronger stabilzer bar got an upgrade in 2016. I have contemplated going to 2016 OEM dampers and sourcing a 2016 stabilizer bar, but i see that they use the same B4 struts for both 15 and 16 so I am going that route unless anyone knows it is a bad idea. This will be a daily driver type car.

Anyway I want to buy springs, struts, bumpers, dampers and upper bearings/strut mounts to assemble loaded struts ahead of time and swap the out with the ones in the car now. I see that KYB has an upper strut bearing/top mount available. Has anyone used the KYB setup? I know it is les expensive than buying the OEM bearing and plate separately, but I don't want replace it twice as often.

Forgot to add a picture of the new family member. I love driving the Fiesta I have to admit.

do NOT use the KYB upper mount/bearing. go OEM for both.
i replaced my suspension and went with KYB for the mount, and those were cooked almost instantly. like they weren't made properly. so i put old (80k mi) OEM strut mounts on the car from my friends' car & those fixed my noise issue. check my post history if you'd like

Thank you, I swear I searched KYB strut mount and found nothin before I posted. Just went and found your klunk thread. Sounds all too familiar. Ford units it is. THNAK YOU!

Is there a big price difference between the B4 and B6 struts/shocks?

I'm guessing the B4's are oem equivalent and the B6 is an "upgrade"??

Sorry about sidetracking your post btw