Do both.

Center your workouts around bulking with basics as has been described here. As far as the diet goes though, it's pointless to eat yourself fat thinking that the extra calories help gain muscle. It'll all have to come off sooner or later. Eat enough to gain of course and maybe even lean toward too much rather than too little just don't go nuts. IMO it's very discouraging to watch the fat accumulating hiding the muscle you do put on. Having 18" arms doesn't look like much if you're in 38" pants.You don't appear to be naturally lean (nor am I) either and will probably smooth out easily if you're not careful.

__________________
There are in fact, two things: science, and opinion; the former begets knowledge, the latter ignorance. -Hippocrates of Cos
"New opinions are always suspected, and usually opposed, without any other reason but because they are not already common." —John Locke
"And you shall know the truth, and the truth shall make you free.” - Jesus Christ

"Perago Validus"