I think the accepted wisdom is set the saddles horizontal rather than angled (as they have been on your bass in some attempt to match fingerboard radius) and in doing so get the action the height you prefer, then set intonation if needed (and small adjustments to get the intonation right will have only minor effect on the saddle height even if the intonation adjustment screw on which the saddle rides is at a bit of an angle). I realise it might be a bit of an iterative process homing in on correct intonation and saddle height, but for me that's almost enjoyable, knowing that I'm setting an instrument up to the best of my ability.