I knew I shouldn't have tempted fate. CEL came back on a few days ago with the same code. It's going back to the garage in a couple of weeks for a service and MOT so I'll get them to take another look. Getting pretty fed up with this now, especially as there are no symptoms. If it wasn't for the CEL I'd have no idea there was an issue.
I did see on another merc forum that someone had a similar problem. They changed the solenoid but the code kept coming back. They were advised to change the other 3 solenoids, as if it was a mix of old and new it could still cause the problem. Does this sound right? This would apply to me. Not sure how this relates to the previous repair of replacing the cam sprocket/gear and actuator, if at all.