I also vote 20 series for the powershift.  I would also vote for the bigger engine and maybe a 9320.  Always go bigger then what you think you need.  It will come in handy some day.  Plus it is nice to only have to run the engine at 1,800 to 1,900 rpms.