When I did the wheels on my Norge, I just got the rims from Germany, they're Behr like they outa' be. BTW, just re aligning the holes to achieve the new spoke angle won't work all that well, ' cos the nipple won't be seated flat on the inside of the rim. Like Pete, I'm a fraction hazy on what you're up to but good on you for messing about, it's a beaut way to learn, ( sometimes painfully ). If you source the new rim you can bore your own holes, but if you're running sealed nipples and tubeless tyres, the holes have to be very accurate for the o rings to seal, but it can be done. I left my Norge in Felixstowe in UK with 43 psi and it read 40psi 2 months later in Australia, (yes I couldn't believe it either).