Nakasendo Walk - Matsumoto - Kamikochi itinerary check

Hi all--I'm second guessing my plan for walking part of the Nakasendo path before heading to Kamikochi and could use some fresh eyes...

October 12, land Tokyo, head to Kyoto on October 14.

Wednesday, October 16

Leave Kyoto on a morning train heading to Nakatsugaway (transfer at Nagoya). Luggage to be shipped to Matsumoto.

Walk Nakatsugaway to Magome

Stay Magome 1 night

Thursday, October 17

Walk Magome to Nagiso via Tsumago.

Option 1 - then off to Matsumoto
From Tsumago, take the train to Matsumoto, stay there 2 nights (Oct 18, 19)

Early morning of Sunday, Oct 20, non-reserved train/bus to Kamikochi where I'm booked in mountain huts for 2 nights.

Option 2, more Nakasendo, less Matsumoto:

From Tusmago, take the train to Kiso-Fukushima and spend the night there.
Friday morning, train to Yabuhana, then walk to Narai.

Train from Narai to Matsumoto to stay for 1 night.
Rejoin the previous plan on October 20 heading to Kamikochi.

I hate to cut Matsuto down to one afternoon & one night, but I'm hearing so much good stuff about Narai and that section of trail that it's also tempting. Is there another way to route this that might make more sense or do I just keep this as a "Nakasendo taster"? Thanks for any input!