This is correct. If Apple made a mistake (still a big if), it's building a phone that was simply too expensive.

The margin numbers that can be found are also for Apple as a company. Given the growth in services which should be high margin, this means the iPhones margins have been shrinking even with the price increases.