I used a surface conditioning tool similar to this one with 120 and 240 grit drums to remove the deep scratches and get a uniform surface. It works fast, is easy to control and provides a nice base from which to begin sanding. Next step is a random orbit sander with 120 then 240 grit to get rid of the texture from the 240 drum. Polishing was done with a firm airway buffing wheel and brown tripoli on a handheld buffer.
The corner I did last night took just over an hour total and it had several fairly deep scratches. The surface conditioning process takes less time than the sanding or polishing steps. I'd estimate 15 minutes with the surface conditioner, 25 minutes with the random orbit and 20-25 with the buffer.
I've been playing around with finishes. Today water based Transtint dye was wiped on all the wood surfaces. It looks good wet and horrible when it dries but that is the nature of dyes.
Next step is a clear coat of dewaxed shellac. Dye mixed with shellac will be used over that as a toner to even out the color. I'm still undecided on the top coat.