Had a WSM, not a fan anymore.
They really don't do anything another established cartridge can do but they cost more to buy & feed and in many cases the magazines hold less. So why?
I like the 308 but don't own one at the moment, nore do I see getting one soon. But of the two I'd go 308.
As for which gun, well thats for you to decide, theres lots of pretty eye candy out there.
At the moment the Finnlight has my eye but I like the BLR in laminate/stainless.
X bolt is nice but the mag catch looks like it could get broken off (my opinion). To me the rifle is excellent but then they cheaped out on the mag design/execution- this isn't the only brand or rifle I have this opinion on.
cheers