Good plan. But I say “Go big or go home!” Upgrade all the things!