The most important thing to take away from Phantom Liberty, for CDPR, is to keep the same writing team that made Phantom Liberty. The story is what sells any RPG, and firing them for a better appearance for stockholders in between game development might look better on paper, but you are also rolling the dice with having to hire a new inexperienced writing team, which risks making the stockholders angrier in the end if the game fails.
Also, when it comes to marketing, try to undersell instead of over-promise, because then the game will be seen as more of a success, even if it will not match the vision you had internally in the studio.
Regarding consultants for diversity and the like, if you want to make a dystopia, actually make one, not a world which is supposedly hell to live in but with perfect representation for all minorities, races, genders etc. In real life, these things end up skewed, whether talking about colonial rulers or autocracies (both of which fit the cyberpunk vibe), so reinforcing that divide would sell the world even better.