Transverse and Longitudinal Spin-Torque Ferromagnetic Resonance for Improved Measurement of Spin-Orbit Torque