The hilt appears to have a selut within the selut, and they are not of the same material/style.
I think that this keris has had another type / style of hilt.
the outher selut and pendok are obiously of the same making.
So I would not change that. But maybe indeed a cirebon ukiran would have been the original fitting
Nice wood grain indeed.