Haven't beaten the game. Not sure how close I am. Just got the light arrows yesterday (hopefully that statement is vague enough to not spoil the game for anyone). I'm looking forward to seeing the content you're speaking of!
For me, games like this are to be savoured. We don't get experiences like this very often.