Agree wholeheartedly about the wax finish, poly is just starting a whole world of pain as it gets wear.
For a top rate filler, that can be coloured, you could try Fill-It, which is flexible enough to move a bit with the wood: Fill-It . Flooring etc always has the holes filled with a coloured...