I didn't pay much attention to the subject distance before. The calculation shows a big difference between 4 and 6 feet. If the subject distance is 6 or 10 feet or further away, focul length is close to 24mm, the aperture can be kept close to F11 and still maintain an infinite DoF. This means use wide angle first and crop later. It also means keep the main subject some distance away.
Wow, this is very useful. Thanks for the link!