Yes he needs both and the workshop needs to be separate from the garage. Don't wont to have to move the toys out of the workshop even time he pulls out the angle grinder.
Don't forget the full length, full height pit, the gantry beam setup (block and tackle hanging from the ceiling that can...