Couple day ago, replacement keyboard finally arrived. I came back to probe more keys and came up with this new Matrix map 

I also probed the LEDs pinout, but for some reason the diodes connection configuration is quite confusing

As for the Synaptics Touch Controller pin map is still remain no change.