I included Spiritrest @54:25 - I did chop out a lot of the end of the playthrough (last 4 orbs) due to wandering around like a headless chicken. The last few orbs felt like they were in places that I thought I'd already mentally accounted for.
If the camera when approaching water surfaces was meant to replicate PS1 awkwardness intentionally, then you nailed it!