Well done
I changed my steering from a 4 spoke to the same one you removed.
I did a bit of research too and as you say it's a minefield.
my car didn't have the flappy paddles but literally within 5 mins of playing in VCDS they were activated. Works perfectly now.
Anyway back on topic that looks great!