That sounds like a great deal, Gamma. At my local dealership (which went into bankruptcy within a week of us working on a deal) they tried to get me for $3000 over msrp and told me that was the absolutely best deal they could do me on that bike and that the boss probably wouldn't hold it for me past the weekend. ha! Well, that bike is still sitting on the floor 4 months later. their whole dealership has been closed since that date. So, I figure they had wind things were heading south and didn't want to or couldn't "help a brother out".
Where I ended up trading and doing business, 85 miles away, they adjusted the numbers, I'm sure. Having bought about 10 or 11 new vehicles throughout my life, I am convinced stealers can either "lower the bridge or raise the river" to make a deal. Rarely do they do both. They can inflate the value of your trade so you feel like you got a good deal there. But their vehicle usually stays put at their asking price. Or they can give you an exceptional buy on the price of their new bike but will lowball you and try to make you feel like a putz for buying your bike or car in the first place, because it "just didn't hold up in value. You should have bought that other bike or car and then it would be worth more than you paid for it on a trade in" ha!
I do know that they gave me $13,800 trade in on my 5 year old bike with 57,000 miles on it. It is sitting on their floor right now with a price tag of $14,286 so it is not marked up that much. I got the new bike for msrp plus setup/delivery, but they made their money on me one way or another.......Trick is to do the best you can do and move forward. Usually, 3 or 4 months later I can't even remember how much I paid for the new rig. Life is for the living. Move forward and ride on!! Never fall in love with a vehicle.............until after you get home. If they won't give it to you for your price, don't be afraid to walk toward the door. Rarely will they let you touch the handle before they come back around and want to resume talks. Sometimes cash talks and sometimes........ not so much. I think you did well, Gamma!