Neither are good, I would go for:
1. Support focused jobs (like BRD) keep their buffs, and are reponsible for party buffs.
2. Make other job buffs and debuffs on a 1 minute cooldown, more interesting, and situational. So jobs can either use their own buffs and debuffs to react to specific situations (that they have to react to in high end) or give themselves a buff either aligned with support job buffs, or just for personal dps as and when.