If that's the case, then for sure just fixing reroll and reducing encounters would help. A personal suggestion I'd make would maybe be that in the first area, the fights are fixed spots? That way, it won't feel like it takes forever if you go the wrong way once or three times.