To get rid of the entire " Buff Server " problem. Remove the buffs completely when you leave Cyrodiil.
That or only have the buffs last a set amount of time after you leave Cyrodiil.
Or
You only keep the buffs for the set amount of time x2 you have been in cyrodiil, and you would first have to either taken a keep or taken 12 resources before the timer starts. ( To solve people from AFK'ing in Cyrodiil and to FORCE YOU PVE CAREBEARS TO FIGHT AND DIE LIKE THE REST OF US.
You fight in cyrodiil for 30 minutes= 1 hour of buffs 2 hours = 4 hours of buffs, etc.