Yeah, I totally get this - The story is like thrown out the window once the puzzle starts. Story in between levels would work, I think!