Thanks for the info Stuart.
I found out about the generic replacement knobs not fitting today.
They were a pretty close match in color and size of the numbers. The main difference is that they are smooth on the top section, instead of fluted (ribbed) as the Yamaha's are.
The shaft diameter is actually too large for the All-Parts replacement knobs, so if i get creative with a drill i can make the new ones fit if i have to.
thanks again.