OP, are you sure it has a nappa leather dash? Doesn't seem that most dealers would order a car like that.
Anyway....forget your add ons, take the bmwconfig invoice and add MACO (it was 400 for me) and then add $500 for the dealer. That is a good/reasonable price. $0 or minus for the dealer (straight invoice) would be a very good deal.
All the extras....locking lugs, wheels/tires, ext warranty can be added later. Research how much they cost independent of your dealer and then see what kind of price he is giving you. If he is close to what you can get them for elsewhere, then buy them from him for the convenience if you want.
BTW...you can probably always get a better deal...but time and travel are worth something.
2004 M3, Silver Grey / Blk, 6MT