I would use an analysed algorithm such as Argon2 and be done with it. If you're so worried about bcrypt, why do you use PBKDF2 which is no better?
But regarding criticizes probably there will be bcrypt, scrypt and argon2 implementations as options on the next release.