Agree totally with assessment.
For the Riau panjang, I thought the sampir was better made compared to the hilt (the hilt looks more awkward compared to the flowing lines of the sheath). The rough finishing on the hilt does not allow me to clearly see the grain that appears on the sampir, so not sure it is made from the same piece of wood or tree, or even if it was made by the same craftsman.
The pendoko is unusual, I thought. Not sure what to make of it yet. It fits the hilt nicely for sure, but the form/motif is less common.