Magnetic Torque and Transport Investigation of the Pseudogap and CDW in YBa2Cu3O6+x