Towards a Better Thermal Neutron Scattering Law Generation: oClimax + NJOY2016