AussieTA - I should have asked prior, is your Canadian KM/H speedo a 2-window or 3-window version at the bottom? I had (maybe still do) a 3-window version from an 80-81 here once, extra light was for choke. I can't recall if they are easily swapped into earlier clusters with the same circuit board, whereas the tacho types can't. I couldn't see a part number in the listing that mentioned the Canadian option, it may have been there but wasn't clear. Or they may have been in separate specialist listing like export model parts were.
Speaking of export, are you referring to the Japanese amber lens versions? There's a guy in Sydney that supplies the amber ends if you haven't seen them listed, need to graft onto existing and rewire harness though. A few times I'd asked owners of the Japanese models how their wiring layout was, but as usual, no response. I know it wasn't easy to convert the stock setup unless you had an extra few trunk harnesses as spares. It's not as simple as swapping wires or bulb holders, half only fit in one location, others only have one terminal in a twin-terminal socket and if you you try to swap you'll end up with the dim side of the brake light bulb. Not sure how others do them, many are vague, seemingly purchased that way or had someone else do the job, which could be a can of worms if they'd actually check closer.