Wave Excitation Force Estimation for a Multi-DoF WEC via a Cubature Kalman Filter: Improved Design and Results