Optimal IdM has a solution that can work directly with SharePoint or integrated with ADFS. It is an STS that can connect to your user store no matter where you users are (AD, SUN, SQL, Oracle, etc.). This way you can still go with a Claims site and SAML tokens with your users. You can with FBA as well with this system, but claims is the way of the future, so I'd stay away from FBA.
www.optimalidm.com/.../