Could legacy gifts work the same way as pledges so that there is a clear ability to identify the payment against the original gift. ie Legacy Gift, then legacy gift payment.
You won't be notified about changes to this idea.