Get the smartbuff addon. it will do everything you are wanting and keeps track of re-buff timers.