Thankfully the W500 series is super easy to upgrade aftermarket like you said, we've never bothered ordering ours with anything but maxed out CPU's - RAM and SSD's are cheap and easy DIY upgrades and everybody on our team can swap them out in a minute or two.