Lacing a 36H rim to a 40H hub is no biggie, simply leave two opposite spoke holes empty at each hub flange.
As S-A is high flange it will probably require tweaking the spoke length a little for the spokes closest to the empty hole.