I think you might like VICTON's Time of Sorrow:
ONF?
The songs you described are calmer than these ONF songs, but you did say you like fun, upbeat songs, so I'm suggesting these. Idk if you'll like them though.
TREI's Gravity is sort of similar to the ones you listed: