Your floors remind me of my floors.... and I've been thinking about redoing them as well. I still haven't made up my mind, even though it's going to be at least a year or so down the line.

One suggestion, for the stains and smells, look up Bac-A-Zap on line. I've found it works miracles and does a much better job than the Simple Solution and all the other things I've tried. It's used by exterminators and other people who have to clean up biological waste. It is safe to use around animals and is non-toxic. It's $$ but worth it.