I think that's a fair way to handle them all.
The Oilers / Flames one is still a weird one. I don't think Neal was a lock to score two more goals.... but it was likely. Honestly, when that deal was made - I think the club probably hoped to be losing the 3rd.
Oilers had 11 games left. Without accounting for games missed due to injuries... Neal was scoring at a 22 goal clip. I think it would be fair either way: The Flames could argue for "spirit" of the deal, while the Oilers would be arguing for "letter of the deal".
Honestly, if they came to a compromise (he'd didn't actually score 21... but he probably would have) and the Oilers sent them a 4th instead, or they still send the 3rd but get to swap a 7th for a 6th (something minor like that) that should probably keep everyone happy.