Ok I think this is done, only thing left to do is fit-check a STEP export against the enclosure before I order the board (see lesson learned above...)