I like Red Lion. It isn't either genre, but it is a feudal Japanese film that is filled with a surprising amount of comedy. Could be of interest to you if you can tolerate older movies. Shin Gojira and Gojira Minus One are also both good, but unfortunately don't fit in the genres you suggested either.