What if instead of all this complexity we did something far simpler: just make an item that gives you increased Spirit as you make kills it endlessly on an item that is already very expensive and currently under-picked.
Say, if you made Boundless Spirit actually boundless and give you more...
I agree that the melee options need late game upgrades. But I strongly disagree that these items should be integrated with other items - like Vampiric Burst - that are already good.
I would instead go for an entirely new items that are late game upgrades for these melee weapons and that...