For me, I'd go option 2. As far as I can tell there are really only three jobs whose fantasy is built around buffing allies (DNC, BRD, SCH) and the whole "buff allies" thing has been spread to so many jobs that it seems to have lost all thematic punch. I mean if I were a FF fan (who hadn't played 14) and were asked "name a job who's all about buffing allies" i probably wouldn't say ninja or dragoon or red mage. Beyond that, it also seems like the issue isn't so much the timing of raid buffs but more the volume of them. If there were only two or three in the game total then screwing up a buff window wouldn't be such a big deal. On top of that it also seems like raid buffs are stifling job design more than aiding it. You can't really have a job without a burst window anymore and though a lot of people like that, i don't think the point of having multiple classes in an MMO is so you can pick your favorite VFX to see every two minutes.