I recently got this from Amazon. It's got five sets of different crimpers. The set that does the factory style crimp is only so-so, in part because it is too wide. It also came with a relatively square set that is perfect for the aftermarket style connectors.

https://www.amazon.com/gp/product/B0195VXA10/ref=ppx_yo_dt_b_asin_title_o00_s00?ie=UTF8&psc=1