I think its #1 moreso than #2 because really #2 is included in #1 in some way. You'd do your ev calcs based on the stack of plays given the probability that X card hits Y% of the time vs your opponent's Z range.