hi tim, i like your blade shape better. the scabbards are remarkably similar, luckily mine has a lot of carved decoration, glad yours has the suspension cord so i can see how to restore mine! i've looked thru all the info i could easily find on the characters stamped on mine, it does look like sumatran (batak), but as you say, there was a lot of trade & dispersion of goods.
i forgot to include a shot of the golok in it's scabbard, so here it is.
i have also went back & enhanced the other foto's at top for more clarity.