Correct
That might seem simplistic, but really, it isn't

It just happens to cut out a lot of the hand-wavium bullshit that seems to try and infect objective history.
The IJN -- and the Imperial Armed Forces in general -- were enamoured with overly complex battle plans. As you say, basing your entire plan on your enemy MUST DO THIS is generally a losing strategy. The staff colleges of any of the other powers (US, USSR, Germany) would have either laughed their asses off or shot the offending parties, depending on who was who.
The real irony is that everyone thinks Yamamoto was some sort of super-genius -- well, he wasnt. Really wasnt. He was a good Admiral, but he was just as intoxicated with the "genius" of Japan's plans as anyone else, and made some really dumb decisions. Remember now, this man KNEW that there was no way, ZERO chance , of winning a war against the United States, never mind any idiots who suggested invading the west coast. Yet, he persisted with the strategy that if they could force the USN PacFlt into a "decisive engagement" , they could somehow secure favourable terms to negotiate the "Greater East-Asia Co-Prosperity Sphere". He never considered that his enemy, would be consumed with RAGE and would only be satisfied with his utter obliteration. Old School War. The way it is supposed to be.
Note on the F2A -- yes, she was a piece of shit; but, that was the version used by the USMC; the problem was the original F2A was an ok fighter, and was very effective when used by the Finns against the Russians. However, when you add armour plating, self-sealing fuel tanks, an arrestor hook, and the radios needed for carrier operations, well, you have a hog. Against an A6M, you pretty much dead meat. Now, the F4F, is another story. it was a lot closer match for the A6M than is commonly realized; no, dogfighting was a bad idea -- although you could hang in there for one circle, and going downhill, but that was about it. Once you lost energy, you were screwed. The F4F however, using tactics of mutual support (aka Thatch Weave) would murder A6M's. A typical Grumman Iron Works bird, tough, armoured, and with 4-6 .50 calibre machine guns, if it scored hits, it was lethal. And USN aviators were the best deflection shots in the theatre. A6Ms simply blew up or burned like torches under fire. Very few Zero pilots took damage and made it back alive , unlike Grumman pilots who would come home, and maybe trash the aircraft on landing. But get out, and get a new one.
One myth is that the F6F was designed to fight the Zero. Completely untrue. The F6F was in development well before the first A6M was recovered and test-flown by the USN. Probably one of the single most underrated fighters of the war, the F6F slaughtered more enemy aircraft than any other type. The F4U came first, but it was a highly complex aircraft, and as such, required more work in its development phase. It wasn't called the ensign eliminator for nothing. In contrast, the F6F was the ensign's airplane -- any nugget could fly it AND bring it aboard safely. Tough, 6 x .50 cal MGs, a ton of ammo, and the ability to haul an ever -increasing bombload, it became what the F-18 is today, the first true strike fighter.
With the 71st anniversary of the Battle of Midway, being, well, right now

one major myth that really needs stomping on is how Hiryu and Yamaguchi , were supposed to be fighting on alone after Soryu, Akagi, and Kaga had been smashed. While it is true they launched the strikes against Yorktown, they were still under Nagumo's tactical control. Furthermore, Nagumo's intention was to press on to attempt to force a surface engagement. This persisted for quite some time, and with Hiryu conforming to his movements (and the relative wind) this aided in the destruction of Hiryu. Even Yamamoto took some convincing before finally ordering a general withdrawal. Spruance was criticized in some circles for not closing at the time, but the cold analysis is that it was an extremely shrewd move. Further, he was able to conduct additional airstrikes on the IJN forces as they disengaged before finally breaking off. He is likely one of the most underrated admirals of the pacific war.