Your assumption that the shorter fork will slacken the HTA is in error. The shorter fork steepens the angle, so that puts
#2 at 54mm trail and 15 flop. It also lowers your saddle to bar drop, steepens your seat tube angle and lowers the bottom bracket. I would consider 3mm of ATC change to be insignificant, but the combined effect may make a noticeable change.