Sorry to hear. I would test drive the 535d before you consider it boring... their latest diesel offering is quite exciting.
E55 AMG is very tempting but insurance must be high for it... parts will be very expensive as well. Anything AMG will be super expensive for parts.
I like Mercedes better than BMW.
Audi A8 should be on your list too