You mentioned the car has 30k miles which is usually when manufacturers recommend changing the mtf anyway. I recently did a change on my Civic si at 60k after having the same notchy issue.
Figured id start with the OEM fluid and shifting quality has improved 100% as well as on/off throttle trans loading and unloading.
Probably can't go wrong with an OEM fluid but my experience with conventional manual transmissions always says use the correct spec'd fluid and you can't go wrong. Although I am a little more pickier as to what mtf I use in imports as I feel a lot of the parts store brands are designed with more multi vehicle compatibility in mind rather than a quality mtf fluid.
That said, I have always had great results with the reputable brands (amsoil mtf, redline mtl, OEM fluids, Pentosin MTF2 etc) so go with any reputable brand and i think you'll experience better shift quality.