These games are pretty old but as your grandfather may have inappropriately yelled when picking you up from kindergarten, "Older is always better. I hate you kids."
The problem with puzzle games is that a lot of the time they lack replayability. Portal mostly got around that with novel gameplay mechanics, a challenge mode and excellent writing which is nearly as rare as sober me.
This is the other way you get stunted puzzle game replayability: make it an ACTION-puzzle-platformer-thing with a concrete story, incredible soundtrack and characters whose motives you can comprehend. This is Shadow of the Colossus and it's really great.
There's an HD remake coming out on the Playstation 3, bundled together with Ico, Team Ico's other classic. Its existence is near-reason enough to pick up a PS3.
Alternatively, listen to the soundtrack while you climb playgrounds and hit the structures with a stick.