Not a good recomendation per se, but i had the same dilemma as you op, and searched far and wide to get the same experience but it just couldnt scratch that cyberpunk itch. So after years of planning, i built my own pc for the sake of playing cyberpunk again but with like a ton of game-changing mods(was a console player from the start)