Got everything assembled and bled after getting the correct retaining springs ... have ordered some retrofit pins also which take a R clip instead of having to be smashed in. Hopefully they arrive soon and ahead of (re)certification.
Got out for a drive to bed everything in, feels pretty good ... would like a firmer initial pedal so will likely do the M3 master cylinder swap at some point.