VANOS fault codes on N52 - 2A82 and 2A87

Getting VANOS fault codes 2A82 (intake) and 2A87 (exhaust) on my E90 325i N52. Car runs rough at idle and has lost some power.

Already tried:

• Cleaning VANOS solenoids
• New oil and filter
• Checked wiring

Still getting the codes. Do I need new VANOS solenoids or is it the VANOS unit itself? Dont want to throw parts at it blindly.