1982 bronco needs a new engine

I have 1982 bronco with the original 5.8L engine.
This was the first year to have an ECM (electronic control module).
It was probably the worst year for performance as well.

I have an opportunity to get an 1989 5.8L motor for cheap and in complete condition (including wiring harness and ECM).

Is this a good swap?
Should I hold out for a newer year such as something in the 90's?
I'm looking for performance, but need to be smog legal in California (what a pain).
My goal is 400HP without supercharger or turbo.

Suggestions??