Who needs South Africa?
Why not get headlight buckets, rings, and grill from an 84/85.   Used ones are cheap and easy to find.

Nothing wrong with stock round headlights, in fact, I like the look better and installed them on my 86 Westy.   Way more headlight choices with round lights.

You can make adapters for the wiring harness so you don't have to cut the original 87 harness.

-paul