How accessible are those components? How accessible are they for you? Most laptops these days require some specialized opening tools and a lot of care. It may not be something you can reasonably do on your own.
In either case, as of right now, I'd say buy on both. Later upgrades are not going to be cheap for a while.

