new dinghy handicap formula

I have come up with a new dinghy handicap formula is it fair that a boat does a lap less.

Formula for calculating handicaps even if slower boats do a lap less with correction for boat doing a lap less

CHT= corrected handicap time
AT= actual time in seconds
ADJ.PY=boats handicap
NLC=number of laps boat has completed
NF= most number of laps done by any boat during the race.

CHT=((((1000*AT)/ADJ.PY)/NLC)*NF)/(NLC/NF)

boat 1

using the formula for mirror doing 5 laps in a race where faster boats do 6 laps

my formula

CHT=((((1000*1500)/1385)/5)*6)/(5/6) = 1559.567

old formula

CHT=((((1000*1500)/1385)/5)*6)=1299.639

Boat 2

using the formula for a laser doing 6 laps in a race where slower boats do 5 laps

my formula

CHT=((((1000*1695)/1087)/6)*6)/(6/6) = 1559.338

old formula

CHT=((((1000*1695)/1087)/6)*6) = 1559.338

boat 2 wins which is fairer as they did more laps but only just which means handicaps still play a part in the race