Just an update on this, thanks davo246 for the FCP Euro link
Ordered the parts from them, arrived today, followed the vid and I now have buttons once again.
I know it's subjective and the haptics are usable, but for me buttons are a game changer, really pleased with the swap and it was cheaper from them than getting the used parts from eBay.
Happy to post pictures or offer help to anyone who wants to do the same.
Also have some haptic buttons and trim going if anyone is interested
