Found a used RCM at a good price, and O'Reilly's carries the Bosch CPS for $30 ... replaced both and it started right up. Revved it slowly up to 3000 rpm and held steady with no issues (it was shutting off at 3k ..)

We'll take it for a spin around the neighborhood and post the results.