Primary contact field for person or company?

When our agents add a new deal, we want them to select a PERSON in Primary Contact field, not COMPANY. But the current New Deal page only has Primary Contact page and both company and person available as an option so it is confusing for our agents.

It would be very helpful if we could have a Company field in a Add Deal popup form, then select the primary contact person within that company for a particular deal.