All the posts seem positive on the swap. But, the doubling up on the cables was pretty well regarded too.
Hoping to get a full consensus. But, if there's a swap that didn't fix it I'd like to know.
Then maybe just order the solenoid rebuild kit and do all the work at once.