Just a thought, you are in CA. Why don't you give Dinan a call and see what they can do for you. If you are paying out of your own pocket for the rebuilt engine, then why not opt for a 4.6L stroker kit. If you are going through warranty, perhaps Dinan can talk to BMW (sicne they have fully licensed service facilities - I think) and maybe they can work out a deal for you. Dinan gives 2 year 50,000miles warranty on their stuff - I think.