ok, i found an rb30e waterpump, Brand name 'silverline' sounded pretty good for $80 and came with a warranty. I'll keep my thermostat housing from the rb20 as it looks in pretty good nick and i'll just grab a genuine nissan thermostat, better to be safe than sorry!