Yes. I do have a plan to unlock Caleb without romancing Bernard.
I should have know better and not do it in the first place. But there's always plenty of other things to do. But I can assure you it is on my list of stuff to do.
About the romance things... Yes, it's hard to replace every single dialogue option depending on the current level of heart. I'm trying to, but it's not always easy.