ID these things please.

For the first pic:
Close of oil filter is oil temperature (2 pin), and other one in block is oil pressure (3 pin)

This is 100% correct. The 2 pin sensor directly above the oil filter is the oil temperature sender. The 3 prong sensor is the oil pressure sending unit.
~Michael