You might consider restuffing the elyticap cans or using Authenticaps to maintain appearance. I chose to drill them out and go with clamped cans on my rebuilds.
Going with the clamped cans allows upgrading the PS for enhanced performance with the McShane kits.
I will contact Jim McShane about kits as soon as the beasties are in hand and have been photographed. It is my understanding there were changes during this models production so having good documentation of exactly what I have seems a logical place to start.
In a perfect world Pio I would be able to get in and out with no visible signs any work had been done. At this point in time that does not seem possible.