I think that you have the correct lock, but your top sash may be sagging. That would cause your lock to rub against the keeper. This may also be why the original keeper broke.
Before you look for a replacement, try filing the keeper or the lock down to fit, or perhaps even both.