I have a 2009 335i and an appointment to upgrade to the Dinan S2 software. I read posts from last year regarding the HPFP issues. I also spoke with someone at a BMW Driver Experience event in Cleveland. It looks like, in the event of a future HPFP issue, BMW would return my software to stock before diagnosing and repairing the fuel pump. Is this true? Would I then need to pay for a secondary installation of the Dinan software? The install will be at a BMW dealership in Pittsburgh. Is the HPFP still a concern, or was it addressed in the '09 model?