If you do want a more modern system that can replace both and is cloud-native, look at Apache Pulsar :)