We too would like have two pick up locations available while maintaining only one set of inventory!  We've tried to figure out several workarounds, but so far we haven't found one other than the "please let us know where you're picking up in the note...