In one week from now I am planning to take the Z4 (3.0 M54 from 2003) on vacation. However, recently it started showing some issues that I have not been able to resolve yet, so I really could use your help

When I started the Z4 recently it didn't run well: a very rough idle with oscillating revving, very similar to what a fellow forum member experienced:
viewtopic.php?p=1736706&hilit=p1633#p1736706
And with a nice video that he uploaded:
https://thevisioneers.io/z4/
This is the exact same issue that I am experiencing. Reading the error codes both P1633 Throtthe Valve Adaption; Limp Home Position and P1675 came up. Searching the forum, it looked like I have a faulty throttle body so I removed it for inspection. Shaking the throttle body by hand, I heard a soft rattling noise on the inside, which would be a broking plastic gear according to Scooba_Steve in this topic. So I ordered a new throttle body (Meat & Doria 89256).
However, after replacing the throttle body the issue is still there

I am still getting the rough oscillating idle between 900 and 1200 rpm and pushing the pedal hardly does anything: it will stall and then move up to around 1300 rpm but still running quite rough. It is now showing code P1632 and P0102 with the yellow DSC, EML, engine and brake light on. I will spend some time later to search the internet.
What I have done so far:
- replace throttle body for a new Meat & Doria
- reset the throttle body (10/15 second on/off procedure and also by disconnecting the battery for 20 minutes)
- checked intake: no sign of ruptures etc
- disconnected Mass Air Flow (MAF) sensor
- cleaned the idle control valve
Any suggestions on what could be the issue here?
I was also looking for the Throttle Position Sensor, but so far couldn't find any information on where they are located? (in the gaspedal assembly and under the bonnet..?)