944 S2 and 968 Door Handles - Can I swap out the lock cylinders?

[maninblack]

Down to the final details on my '91 944 S2 and trying to figure out my lock options.

The PO installed 968 door handles (photo #1). I want to go back to stock so I'm buying a new set of later 944 handles (photo #2). When the PO swapped out the handles previously, he did it right and I have a single key for my ignition/doors/trunk. Obviously, I want to maintain that.

From the PET, it looks like the lock cylinders are the same part #'s for the 944 and 968 door handles. That being the case, I'm assuming I can just swap the cylinders between my current 968 handles and my new 944 handles? Can anyone confirm?

And, assuming I'm right, and as my guy has fallen off the face of the earth, does anyone have a recommendation for a good Porsche locksmith who could do this for me?

Thanks in advance for any help.