Why not give Graham a call at Plans, they've recently overhauled a couple of Nsx engines after removing them first and there're labour rate is very competitive compared to main dealers, being predominantly NSX specialists certainly gives me confidence when I go there.
They even sometimes have a courtesy on hand.
https://plansperformance.com/approach