I'm contemplating the XCR pistol, if I do the Tavor I'm going to ditch the PS90, it's one or the other.

Haywire I think your right a 30/30 might round out the lever gun selection, I also think a 223 bolt would be a good idea, perhaps a Savage...