Which finish for 100 year-old a pine floor?

[Shayna]

About 10 years ago I sanded down by 100 year old pine floor and applied water-based urethane and last year I applied beeswax over the top (WRONG I know!).

The urethane has worn in places and the choice is either to re-sand the bare spots and apply something a bit tougher over the top or to re-sand the whole floor and go for a beeswax finish. (I assume I can't apply beeswax over the top again when I have re-urethaned the bare spots). I like the idea of beeswax but don't want the colour to yellow. I have a 13" polisher. What finish would be most practical?