Sounds like a plan to me. There will no problem with the oil and shellac over the old. After you get the look you want,
you can then wax the machine to maintain the shine. I use a good quality car wax for this. But remember the shellac need to cure for about three weeks.