A thought about the freewheel: Looking at your photos very carefully I would be very tempted to say the 24tpi is a better fit, and I believe most Shimano freewheels are 24tpi. You might be all right, though I am very hesitant to counter
juvela on the advice of sourcing a metric freewheel.