I'm a huge fan of Mausers. But given the two choices, K-31. I have one and they're as good as people say they are. I dropped mine into a modern stock, easy to do and didn't require modifying the rifle so it can go back to it's original military config.
"And remember, Abraham Lincoln didn't die in vain, he died in Washington D.C." - Firesign Theatre