Yes, that’s exactly what I’m trying to do now. That takes a little bit more effort and time but I think will be my best option. They have here where I live some all in one pre build and ready to ship PCs (mostly from HP) which do have pretty much the config I want. But I got burned with HP Omen before. They had horrible customer support and their machine was absolutely not upgradable, apart from memory.