Might it be possible to just add a non-functional command to the end so that the last actual command is completed in full before CS is raised? Does the SPI flash have some kind of "no op" command word?