Dunno if these are any good to you, nor can I vouch for their quality. I just saw them there, thought they'd look better with the quads than the S2 or S3 blinkers.
http://cgi.ebay.com.au/DATSUN-NISSAN-910-TRX-BLUEBIRD-FRONT-TURN-SIGNAL-LIGHTS-/150386884365They should fit on your car, and they'll probably line up with the quads better. To solve the headlight surround issue, maybe you could make up an aluminium panel or something to go around the lights and paint it? (wrinkle black would look hot

)
Then all you'll need is a S1 grille to go with it all. I may be able to find one for ya if you want, which you know you do!

If you're set on the S2 blinkers, then there's a S2 grille on ebay, but S1 would look so much better, it'd be worth the wait...
http://cgi.ebay.com.au/nissan-bluebird-910-series-grill-/200502601419I actually wonder how the quads would look with S2 or S3 indicators and grille, but have those plastic headlight protectors over the top. It could actually look pretty good I reckon.