Have you thought of trying what @sleepless did, using a 3d printed jig to make a new set of angle holes?