If you're going to do it by hand anyway, you could add the missing tracks to Musicbrainz. This way Picard would be able to recognize them, for you and for everyone else.