Okay, I finally managed the drive the car on the back roads today and have the brakes tested thoroughly. I have tried to bed them again - feeling a bit sick afterwards. The problem is still there, but I can now for certain say that the first stroke is spongie and it firms up if I pump the brakes.
Does that mean there's still air in the system?
Macan Turbo - White
1///M - Valencia Orange
X3 30d - Alpine White