You do exactly what you said, remove them from one funnel and move them into the next. You could create a new audience list specifically for these people – ie, Visitors who entered site through TOF and completed lead form.

I think that is the only way you would be able to keep track of the performance specifically for that group of users.