Work them both, plus a whole lot more. Throughout the week I try to work every muscle group if possible. Also, remember that the body will adapt very quickly so if your workout is the same day after day then you'll plateau really quickly. Try to take yourself out of your comfort zone as often as possible and very the workout by introducing new exercises and different rep ranges.
I wouldn't try to bulk up to much since your after a program that fits well with martial arts but that doesn't mean you should forgo power lifting. Just make the power lifting a smaller part of your program and concentrate more on lighter weight and high reps which build more endurance. Weightlifting shouldn't be the only thing you do for strength training either. Body weight exercises like pushups and pull-ups are great.
Here's a few pushup tips. I like to very the leg height in both directions in order to work incline and decline pushups. One of my pushup workouts is to lay a heavy bag on the ground and place my feet on it and hands/knuckles on the ground, do a bunch of reps and then switch so my feet are on the ground and hands are on the bag. Also I will do pushups at the end of the heavy bag by placing one hand on the bag and one on the ground and launch from one side to the other and each time going down as far as possible. It's a lot like 18elders described but instead of going straight up I am going from each side of the bag to the other.