Yeah, I think rather than having a bunch of tiny levels, separating the puzzles into a few larger rooms and putting checkpoints between them would help a lot.
