Arcane Research discount is not applied correctly after re-adding lower level spell

[Shestel12]

Describe the bug
When you upgrade the spell, and purchase another lower-level instance of it in the same upgrade, discounts from Arcane Research do not apply

To Reproduce
Steps to reproduce the behavior:

1. Create a deck with 1 copy of Divination(1) in it
2. Upgrade the deck, adding Divination(4) and Divination(1)
3. Total cost of the upgrade will be 4xp instead of 2xp

Expected behavior
The total upgrade cost should be 2 - cost of upgrade of Divination(1) to Divination(4) should be 1 (discounted by Arcane Researches), and cost of new Divination(1) should also be 1. Example of the deck with the upgrade made:
https://arkham.build/deck/view/5583948?tab=history

Screenshots

Initial deck

Upgraded divination (discount applied)

Added new divination(1) (discount disappeared)

[fspoettel]

related: we do not have extra logic for the {add/swap} + upgrade case at the moment. If I understand this issue correctly, both can be fixed with the same logic added