Previously I voted for "Both" but now I'm going with "K-pop" and Korean music in general.
I barely listen to Japanese music now as it bores the hell out of me. The only Japanese artists that I care for now are Crystal Kay, and Namie Amuro.
I've always felt the Korean music scene
as a whole is so much more raw and diverse imo, especially the K-indie scene. Just my two cents.