New year and my blood pressure already rise...

Not entirely true…it would depend on future work from that client. It might be worth stipulating a reduced cost for the first job and then explaining the time taken and future work costs.