Yep same issues, N47 engine...I'd try get a 320d, extra power is noticeable I found.