Yea, there are a LOT of reasons to toss a Bosch CPS in there as a first step.

I'd do that first, it's easy and cheap and a common failure item.