First of all, sorry for the long absence. I’m involved in many projects and I couldn’t get to this earlier.
Here are the updates:
I’ve bought an extender for the RP pins from Jola Engineering and soldered the shim onto it. Now I can put everything together nicely.