IMO GM is doing a better job of it. While they do have a compliance car (Spark EV), they've also got the Volt and Bolt, and both will be 50 state cars.

Ford has primarily focused on hybrids and there EV offerings are either fleet-only or compliance cars.