This is pretty much my flow as well. Haven't gone beyond managing three work trees in parallel. It's nice being able to test locally against multiple work trees -- one is at 3000, then 3001, etc.
If you're in the right zone, give Pawpaws a chance! North America's largest native fruit! I've got about seven in and around my other trees (they're a forest understory tree) but haven't gotten fruit yet. Any year now...