Protip: You want to go into chapter 7 being full on water arrows, in fact i am not sure it's possible to complete this chapter if you have none, or at least on master difficulty anyway.
Having just finished the game i have to say it deserves the 69 it's currently rated on metacritc maybe even...