I recently bought a CS800 that came with an oiled finish. I applied 3 more coats of Danish oil followed with 2 coats of wax. Result, more than happy with the finish. I then attended the HFT shoot at Millride where the stock was scratched to ribbons by the barbed wire all around the place.
When I got home, I spent a good 10hrs removing the finish down to bare walnut, I applied an American walnut stain, 8 coats of danish oil &, so far, 1 coat of wax. I will finish with probably 2 more coats of wax when my arms out of pot. Pretty darn pleased with the result so far, and as already mentioned before, waxing will improve with time.