Get your taxes done using TurboTax

No, I am not sure whether or not there is a better way without actually looking at it, but your approach certainly appears to be a reasonable one.