Generally you'll want the same shaft in your driver and 3 wood for consistency of feels but that's not a firm rule.  The RIP shaft is a relatively LOW spin shaft with a lower launch angle, (It was my second choice in my fitting) so I'm wandering if you really meant that you had  really HIGH spin rate or do you really have a low spin rate.  Low would be good with a wood and if you'd said that you have a low spin rate, then I'd say you're good with the same shaft.  Since you said high, maybe you should be refit for your driver.

As for D2 vs D3, that is a matter of personal preference. The D3 is taller and tends to hit the ball a bit lower.  I use the D3 and the Fd 3 wood.  The D2 has shallower face and hits the ball slightly higher. Since you use the F 3 wood, perhaps you like the shallower face and the D2 will fit your eye better.  I know this is a bit oversimplified but that is the way I think about it.

Jerry