I've been fighting the clutch on the GF for a similar reason, and yesterday discovered that three of the basket segments were slightly distorted, impeding plate movement. Eased them out a bit and now plates move easily.
Test ride today after the engine rebuild and the clutch is fine - I can even get neutral at a standstill, but there's always that lingering "have I missed something" thought after a rebuild!