No doubt about that!
In that light I would say the title O Sensei is above Shihan and sensei. Sensei would be teacher, shihan example, so O Sensei would supersede all. Not surprisingly as he developed Aikido and is at the top.
One must not discount the fact that when there is a waka sensei in the dojo, the elder one is always refer to as O sensei.