I think you did alright. I helped my sis get $6,100 off her $33.5K (all-in) vehicle, but the financing wasn't as good as yours. Note, $2500 of that was manufacturer's discount. My sis made the mistake of originally telling them what her monthly budget was and they took advantage of it until I got involved.
Just be aware of the tricks they pull. For instance, after she told them her monthly budget was $350/mo, they offered her a deal that had her paying $173 biweekly. FYI, $173 biweekly is, on average, $376/mo, not the $346/mo they were trying to trick her into believing. The final deal once I got involved was $334/mo.
You have to be willing to walk away and shop around. And let them know you are considering vehicles at different dealerships. You can work it into the conversation fairly easily. "Well I really like the heated seats the Chevy X has" or "the Dodge Y comes with a tow bar" which serves the duo purpose of trying to get them to throw those items in or give you a discount to compensate, as well as letting them know you're looking elsewhere.
Don't get hung up on a specific car. If you come to the determination that you found the one and only car you want, you've lost bargaining power.
Salespeople may act as your friend, but their primary goal is to sell as many vehicles as possible, and at the highest margin they can get away with. Be friendly with them, but don't trust anything they say.