Thanks.
I've concluded that to just assume a number halfway between the output of a P+ and a K2 will be close enough as the 20mm fins on the old models have been increased to 30mm on the new ones. Gives an answer within engineering accuracy, given all the other uncertainties in the calcs.