Jdm folding mirrors.... on JDM wiring, This isn't your everyday question... Options

[ricochet1490]

For those of you on here who are aware, I've been building a RHD SS3 for some time now. I'm in the process of buttoning things up and the mirrors continue to cause me grief.
Let me outline the scenario...
The dash wiring is from a 98 RHD Jap celica.
The door wiring I scored is from a 94-95 celica. (proven to me by the existence of a pink wire in the loom.)
When I received my wiring, the plug pigtail for the folding mirrors was cut.
I have the mirror relay WITH pigtail but have no where to "plug it in" due to my 98 wiring harness expecting the type of mirrors that don't need the extra relay.
I also have the switch and what I believe to be a serviceable pigtail for the old mirror type with the pink wire.

I ALSO have a switch and pigtail for the new mirror type that doesn't need the relay.

I therefore have my option really, but it always seems like I have the wrong plugs/harness to make this work...
Does anyone have any ideas or clear direction to go? I've scoured every JDM mirror thread in this forum and nobody has this mismatched wiring problem that I do.

I'll post a pic of what I have on the control side in a while. Any thoughts? Or am I going to have to cut, splice, and repin some wires to make this work?

Thanks for the help