Intermediate shaft end float

I am rebuilding my mk2 KR engine and have measured the end float to be 0.30mm. Max endfloat is 0.25 and even though this is not much more ot will only get progressively worse. I also have a scrap KR engine and endfloat in that is 19mm. I'm tempted to remove the bearings and refit into the engine I'm rebuilding but I would prefer to get a new part. Anyone know where I can purchase a shaft and bearings from? Or any advice how to go about this?
 

Bearings won't change the end float, could you swap the shaft from the spare engine or add a shim?

Yeah I noticed that soon after, I have 2 flanges and 2 shafts and both seem to be the same result anyway you do it. I think the wear in on the engine side, I might be able to get a few mm off if I get a new shaft or flange but that will only be 4-5mm at most. Is it possible to shim? I wouldn't of thought so because of lubrication access, but I could be wrong