A downhole tool includes a tool body, at least one blade with a front face having an undulating geometry including a plurality of ridges and valleys, and a top face facing outwardly from the tool body and transitioning to the front face at a cutting edge. At least one cutting element is in a pocket at the cutting edge. The at least one cutting element has a non-planar cutting face facing in the same direction as the front face. The non-planar cutting face has at least two sloping surfaces meeting at an elongated crest, valley, or other feature. A portion of the elongated feature adjacent the front face may substantially align with, and have substantially corresponding geometry as, a ridge or valley of the front face.