Alternately, you could reduce or eliminate the benefits of holding an office by modding the traits files. That way you keep some flavor while curing the "Super Leader Syndrome".