Being able to get paid seperatly for the diagnosis and the repair is a mechanics dream. Warranty flate rates are well known for rolling both up into one figure. I bet this issue has driven more than one mechanic away.
But much more importantly, too the OP, please don’t feel obligated to pay this un negoiated charge, that mechanic has no right to spring this on you like this, clearly a rip-off.