Rest stroke and octaves

[wintoid]

I've been playing bass on and off for 45 years, yikes.  Before bass, I had been mostly playing violin, and I guess what was my pizzicato technique on the violin got transplanted into my bass playing.  I play free strokes, basically.

 

Recently, I've been trying to practice rest strokes, with a view to potentially trying to adopt them more or even completely.  When I play with rest strokes, my right hand fingers are almost completely straight.  There's something incredibly satisfying about the motion of plucking this way, I love it, but I've got a lot to learn.

 

One of the hardest things seems to be crossing 2 strings to play octaves.  I wondered from more seasoned rest-strokers (ooer) whether you switch to free strokes for octaves?  I feel like I need to curl my fingers and change my hand position to miss the string in between the octaves.  Or is there a trick to make this easier?