Slip the tech a $100 on the side.
Warranty rate for this job only pays 7.7 hours and it usually takes longer to do it right.
Just tell him you know about how much work is involved, that he will get shortchanged on the warranty labor, and that you really appreciate his work.
He will either thank you and decline the tip while appreciating your concern or he will take it and do a great job in either case.
Steve