Don't focus on continuously making shot-based moves into melee moves.
It's probably going to feel cheap because that's what I think of when I see characters with a million different types of moves.
Well there's not much you can do about that since most of X's weapons are projectiles. But he can still be balanced even if he's projectile happy.