I used to do the same with just Excel. First sheet called 1040, one row per line. Schedules and worksheets got additional sheets, so I could easily pull in the values from and to other sheets.