The genre is difficult as you are on a fine line. Personally I would bring it to 2022 which means thick low end (bit more hifi). The night rider 303 can go down a bit in volume. Bit more side chaining overall and you should have a more butt kicking mix