i dont know how you can accurately pass judgement on the manga when its only at the half way mark of the war arc, being the climax and all U_U
with regards to what you said about kabuto's role, if naruto hadnt gotten to the battle feild when he did tobi's original plan, to tear the army apart from the inside out with white zetsus cloaked as random shinobi , would probably have been very effective, its espionage of the highest level and not many armies could withstand such an assault and still be effective, so the issue isnt tobi's lack of preparedness it was naruto's intervention, and kabuto clearly had been waiting to make his move, collecting dna for edo tensei and altering madara's body,logistically he was probably good to go for a little while, but the only other way he enters this war is if hes opposed to tobi as well as the shinobi forces, and its safe to assume that he didnt want to confront tobi yet as an enemy, so you can view it as rushed, but i think its just story lines coming together
edit: it struck me as unusual that tobi made no reservation for naruto having emotional sensing abilities since he clearly had knowledge on it by describing how mito had the same ability for being the 9 tail jin, something that would clearly put a dent in his plans by usurping his zetsu's positions in the shinobi ranks, its like in the long run he didnt think it would matter maybe, but what i think is more likely is that he didnt think naruto would accomplish it that quickly