@msh210 Midrash is a body of work, a great deal of which does parshanut, but not all. I'd say that
midrash should refer to that body of work,
parshanut-torah-content should refer to commentary on the Penteteuch (and perhaps the whole Tanach),
drush should perhaps be a synonym of the latter, and where they intersect, they intersect.