On a like-for-like remortgage, can I add the product fee to the loan?

Yes, you add the product fee to the loan. However this must also fit in with the ICR calculation.