By current estimates, it'll get better around the end of 2022, but from what I've seen, I think it'll go on till 2023 at the very least. So, if you can get the parts for MSRP or second-hand (without paying scalper prices), then yes, building your PC will be cheaper.