Same here, my 2nd M3P arrived in August 2022, and ordered a Highland LR, same colour. If they release a"P" I'll cancel this order and re-order a P.
Same as you the indicators are the worst part of the car, so I'd welcome the buttons ( the minority might be bigger than you think).