The Claim plugin redirects non-logged in users to /?geodir_signup=true
So I ended up changing all references to /?geodir_signup=true in geodir_claim_functions.php to my membership registration page, so the claims links now redirects to s2member registration.
That made me think that all GD needs is an option to override/change any link to the registration and login pages?