I'll just tell you what we do, then wait for someone to shoot holes in it:
We start with one or the other. We will go from quoting an appraisal to actually charging for an evaluation, but basically never the other way around. If we are doing the former, then i document in our LOS's tolerance baseline that there is, in reality, no "new" fee--just a fee that migrated from "cannot shop for" to "origination charges", and this migration benefits the consumer (because the evaluation fee is much, much less than an appraisal fee).
IOW, we don't cure because we started with a $450 'cannot shop for' appraisal fee that turned into a $100 'origination fee' evaluation fee.
_________________________
I'm fixin' to fix that.