I can understand your disappointment. Maybe if Katniss were a little more suspicious about Haymitch's ongoing plans it would have been better, because the flow of event were obviously pointing to "being mentors". I think this is the ultimate disadvantge of the 1st person POV, it gives you false expectations and sometimes when the character is suprised you end up being disappointed instead. Writing is risky business, very very risky.