Considering that Conan whispered to Agasa, I think he has come out with something. Additionally, it is something really important that will force him to warn Akai (Okiya) regarding Amuro's action. So i am pretty sure that at the time Amuro came to Okiya's residence, Okiya has been prepared along with Conan's plan that he whispered to Agasa. Thus, I don't think that Akai's death will be revealed to Amuro just yet.
I would think that the Okiya living in Shinici's house is not a disguise. He really is somebody named Subaru. However, the Subaru that appeared in the Bell Tree Express case and the 13 red shirts (? I am not sure abt the title of this case) and in some other cases where he appeared was Akai that disguised as Okiya.
The second possibility is that there really is somebody named Okiya and Akai disguise as him and live in Shinici's place, with the real Okiya living somewhere else. And so, in case his cover is almost blown up as it is right now, Conan and Akai could call him over to replace the fake Okiya (Akai).
Coz it would be too risky to disguise as somebody that does not exist and thus Conan and Akai would not take that risk. At least that's my prediction. I hope that Aoyama Gosho will come out with somethinf that will shock me out.
I really cannot wait for the 900th edition to be released!
