Order Bundle issue while updating the actual pick up of the shipment

Hi Team,
I have two order releases having Early and Late delivery date only (Early and Late pick up date is not specified) and having the date emphasis constraints as Both.

and the planning Parameter "HOLD AS LATE AS POSSIBLE" is set to TRUE.

Hence, while planning via bulk plan, the start/end time of shipment is populated to accommodate the Early/Late delivery date.

Condider one of the OR having 04 aug and 10 aug as Early and Late delivery date and
Another Order release having 06 aug and 20 aug as Early and Late delivery date.

So while planning, the start and end time of the shipment is set as 20 aug.

Here i have two issues:
1. My shipment actually completed by 18 aug itself. so i can't able to add the cost manually since start date of the shipment is 20 aug but the end date is 18 aug.
(We are updating the end date in separate event up on completed the delivery(Completed Unloading at Delivery Location)).
2. Consider the actual pick up happening on 12 aug, so in this case while updating the Actual pick up and actual ship unit count, its is throwing the below error: "CAUGHT THE FOLLOWING EXCEPTION WHILE PROCESSING TRANSACTION: Error creating Stop Order Bundle for Shipment Stop". Since, the First OR late delivery date is 10 aug.

I like to know, how to avoid both scenarios.

we can't change the OR Details, because that is the client requirement. So, it will not have Pick up date and have only delivery date and the date emphasis as Both.

But i can able to change the Planning Parameter set.

Any help is much appreciated.

Thanks.