Olympus 12mm f/2.0 or Panasonic 25mm f/1.4 for portrait

My current lens kit is:
Planar 1.4/50 MF
Distagon 2.8/28 MF
Oly Zuiko 14-42 II R AF

Now I need faster speed AF portrait lens which I concen
about the bokeh (DoF) and the small space (short shoot
distance) , resturant, pub and bar are the scene I use to
face, limited space and lowlight, since the focus distance
is doble in M43, the questions are:
25mm f/1.4: very good DoF but concern about focus distance
12mm f/2.0: cover almost all shooting in small place but DoF is good enough?
Please I need a opinion ,suggeation, thank in advance