The lump sum is the greater of the value using both the 417(e)(3) rates and applicable mortality and the actuarial equivalent rate.
In addition, the greater of the calculation using the old actuarial equivalent and the new actuarial equivalent must be used until one year after the date of adoption of the amendment. Since your actuarial equivalent was using 30-year treasury and not the segment rates, you should do this calculation too.