I may be late on this, but heres my thought for easy fix. if im late or behind please feel free to let me know.

Can you just make a self cast / non targetable Velo in adition to the targetable Velo? Would be like Egg. If you have random buff Double egg you can use your own egg and it replaces it. If you have a self cast / non targetable Velo it would replace any velo you have allowing you to then recast your own and not worry about the issue of not being able to buff or having to use velo potion and then cast velo.