Here is my theory to this:
First of has anyone ever considered the amount of people that shinichi has lied to once he tells the truth, especially ran, People won't like it, with that said- here is the ending
Conan finally hears about the Boss of the BO then finds out where the HQ are based, he goes there to have one final showdown with the boss, with the help of his parents, agasa and AI, it all ends here, the climatic showdown. Conan tips off the police and FBI using his bowtie to surround the HQ and about their existence. They go there to ensure one escapes, he then realises that he need to tell the truth to ran and others once it’s all over
Once inside, after taking down the operatives, he finds the original men who poisoned him in the first place alongside with the boss. He's hiding in the background overhearing their conversation, while this is going on, the police; FBI and Ai have their radio micas connected to Conan so that they can hear in.
In the shadows is a small boy, the three are shocked, he then tells them that he is the boy who poisoned home.
Conan then goes into tears and is angry about the people he had to lie to. (This speech goes on for a while)
After dramatic speech, the boss orders them to take him out, after several fight scenes, coin uses his stun gun to put gin and vodka to sleep.
The boss confrontation takes up the whole episode, explaining why they did what they did and what is the BO, after failed attempts to get the boss, Conan blackmails him to give up or the police will come
Then the boss has one more trick, he has attached bombs around the base taking him and Conan long with the base
Shocked at this revelation, Conan then orders the police to storm and arrest any BO members Conan then uses his trainers to knock the detonator out of the boss’s hands as well as knocking him unconscious
After a while, Ai tells that Antidote for APTX is under the bosses table in the safe, but before he can open said safe, the boss garbs hold of the detonator and about to blow up the base, the Up ends with cliff hanger
We then see the boss is struggling that because he is already dying, Conan grabs quickly the antidote, thinking whether or not to leave him there or take him with him, guilt plays a part in this however he is reluctant to save him. However the base blows up with only seconds to spare before Conan is blasted out of the base.
Everyone surrounds the boy having being injured ran is all upset see a glance at shinchi for a brief moment thinking Conan is shinchi
After a few days in hospital, conan wakes up to find Ran by his side, after realizing that he is alive and found that he is lucky to be alive, turns out that the antidote is still with him,
He wakes up ran to tell her something, she is upset and glad that he is alive, with them being alone, it is time to tell her the truth and the secret comes out, Ran is stunned at this but after a few hours of explanation and misunderstandings, she comes round to his story,
He explained why he had to it so for that reason showed her the antidote that will permanently bring him back to his old body. Tells ran that Hattori, Agasa and Parents were all in this she is still upset that he told them instead of her but after listening, realises that in the long run it was for her own good
Shinchi is back to his old self but must come to the realisation that he has to tell others first so he goes off to the police to tell his story, being shocked at this, they understand why so after telling them everything, its off to ran father and goes to explain that it was him that solved all the cases not him not Moore, (mori) at this point he is angry at this that he has been living here all this time, solving these cases one after another and finding that he is not a great detective once he thought was. Soon tension dies down tells him that he is still a detective just not a great one.
The two finally get together as a couple and promises that no more secrets between them and that he will always be by her side and will always protect her.
There is a scene where we see Ai telling the other kids that Conan no more, turned out that it was shinchi, although mad about this, it was good reason, they can’t blame him for what he did.
The final scene shows shinchi and ran together in a few yrs time, married and now living together, he is going of solving cases and she is there as his assistant, showing the two strong as a pair.
What do you think?