Gretsch Catalina Club vs Mapex Armory

I've had a Gretsch Catalina Club for a while (18" kick, 12 and 14" toms) and like it a lot, but have been thinking of switching to a Mapex Armory in Night Sky Burst (it's so pretty 😍).

I play mostly rock and metal and figure the drum sizes and birch/maple shells might lend a little better to those genres as well. But curious what you guys think: Is this a lateral move since they're both considered mid range/intermediate kits or would the Mapex be a step up?

Thanks in advance!