Gosh, I'm not sure about a suitable replacement other than the surface mount BSS84... I remember it wasn't availble at DigiKey but then I've pretty much stopped using DigiKey in favor of Mouser, which is where we purchased the TP0610L devices...
As for the 2N7000 devices, I buy them 100 at a time from Mouser... You can connect the gate directly to a PIC output pin without a resistor (the gate draws practically no current) and they'll sink a couple hundred milliamps easy for driving 12-volt or 24-volt relays (open drain configuration)...
Good luck, have fun... Mike - K8LH