The way to ethically handle this is to have a clear and contractual minimum number of billed hours in a day. That will get you paid well for built in efficienci

The way to ethically handle this is to have a clear and contractual minimum number of billed hours in a day. That will get you paid well for built in efficiencies like OP mentioned, and keep you paid fairly on more substantial change requests.