I may have lost track of which files were which but had troubles getting GPSFDshp2mp to run. Two things eventually seemed to work:
Drop Z/M Values (Toolbox/Vector Geneneral) from all three combined files
Multipart to Singleparts for all three combined files (tutorial doesn't mention doing points, but it has to be done).
Drop Z/M Values (Toolbox/Vector Geneneral) from all three combined files
Multipart to Singleparts for all three combined files (tutorial doesn't mention doing points, but it has to be done).