While it may seem like a small fix this would require a re-balance on many of the skills that have charges. Currently you need to find a good rotation that plays well with the buffs you have, learning to use the skills at the right time or right order is part of it.