Your reasoning on applying the extra 2K to 2020 is sound. Just be sure the client understands and also keeps it in mind for filing next year. Maybe they could even do it earlier to avoid the rush and confusion? (Wishful thinking!)