Finally got enough time and enthusiasm together to do some jobs on the car over xmas and have been doing a bunch of the wiring tasks i set my self 3 years ago before work got in the way again!

I have managed to find a few of the OEM connectors and terminals with a bunch of online research, lot of them being Sumitomo or Furukawa types.

The one that is stumping me though is the tail light connector, it seems like it should be something like a Yazaki CN-A but because it's 7 Pin with an offset latch nothing seems to match.

Has anyone found either the full connector or just the terminals for this before?
If so would appreciate some pointers for somewhere to get them from.