Sounds like no matter what happens with the second clinic, the first one is not going to work out. If you liked the t, then staying with the clinic and putting up with their policies and possibly not liking the second pdoc would make sense.
Since you don't like the t nor the policies, would you really go back there is the second clinic doesn't work?