Apply automatic price break as discount, then apply manual modifier

We have a requirement to apply an automatic restock fee where we use a modiflier line type of price break header with price breaks based on a percent or lumpsum depending on the value.  We want to apply a manual surcharge modifier (waive the restock fee) that when applied will automatically calculate the prior adjustment.   Example Item sell price $150 automatic restock 15% = $22.50.   New RMA price is $127.50.  The manual modifier needs to be applied that will automatically remove the prior calculation ($22.50) so that the final price will be $150.