I spoke to Centenary Mazda a while back about this (was just getting a soft top replacement figure for car hunting reasons) and they said the NA soft top now has a glass window and comes complete with the rain rail. Not sure if it's the same part or not though, but they might know if you call them?
I believe that there was just one type. I have already done this exact swap onto my NA6 and the NB top was complete with rainrail etc and it fits just fine.