ABS/ESC, Tyre pressure fault - CAN connector?

[Twisty]

Hi I've been getting ABS/ESC and Tyre pressure faults on my 2016 Volvo V40 D4, it started out intermittent but is now pretty consistent.
From reading on this forum, bad contacts in a CAN bus connector is a relatively common cause of this issue.

Initially, I had some success unplugging connector, spraying with contact cleaner and reinserting - however, this doesn't seem to work now.

What I would appreciate knowing is if I am looking at the right connectors, circled in red in the below photos?

Also, if there is anything that looks different to stock - there is some evidence of some hamfisted fiddling with the wiring looms before I bought the car!

I'd also be grateful of any advice on how to fix - I've got some electronics tools but wondering what is a suitable replacement connector to use, or if it would be a problem (future servicing etc) removing the connectors altogether and just soldering/heat-shrinking the connections instead.

Appreciate any advice.


Near Accelerator pedal


and below the glove box

[Twisty]

I cleaned a bunch of other connecters, including the one below the non-drivers side headlamp and was still getting the error. The problem was actually a wheel sensor
Would still be good to find out which connector does what though.