Exactly. The world in Brave New World was actually designed initially as a utopia. Its citizenry would actually be quite happy, whereas 1984 would be hellish nightmare.
However I definitely tend to see less Eugenics policies and government mandated sedatives than sweeping new policies restricting liberty and privacy. So for the time I'd say we are definitely heading more in the direction of a 1984 dystopia.
