Definitely go with polyax nipples, the head is shaped like a ball joint and gives alot more angle as the spoke leaves the rim bed
You may want to drill the holes out about 0.5mm larger to allow the nipple to seat deeper and give the spoke more room to move
Here's a sur-ron rear wheel i did 3x...