pogar: Used that link to check originally; adding the "short" trip yields 20113mi.
KLouis: 16k even or higher should get me there; assuming the extra 1576 from the "short" trip goes toward Gold also, I'll have a bit of a margin of error to work with.
Thanks all!