You can have the role of main villain. Jehoel is closer to a force of nature than a leader, anyway.

I personally would be fine switching to a (rules light) system. All of the points raised in its support are valid, in my opinion.

Removing of the numbered divisions could make sense; if the initial Arrancar attacks devastated the Soul Society badly enough, there could have been a large-scale reorganization.