X, but you did not specify the amount of cals. To stay lean, and gain muscle (at a slower rate) just add 500 cals to your AMR. The key is to eat more than your maintenance considering you activities. Watch out, bmr does not equal amr. That means I would eat 3000cals because my AMR is 2500.
However, if you bulk , it's not like the fat gain will be unnoticed and will be slapped onto your ripped physique . If the fat gain is too extreme, just down the cals around 300 - or if you are not gaining enough, bump it up another 300.
I like X's ratio - I tried it and it gives me greater pumps than 403030 style for bulking. Carbs are of prime importance during bulking, be sure of it. Protein should be kept at 1g per pound, no less. More is possible, but whatever you do , eat more carbs than protein.
I suggest you bulk (with controlled calories, meaning you monitor everything) and decide if the fat gain is too much , and the muscle gain is too little or too much, then just adjust cals accordingly.
Peace