Guys, I just got that Madcatz MvC2 stick (which is supposed to be a SF4TE remake), and I want to upgrade the stick and buttons (square gate just feels so unnatural to me, and I despise the 8 button layout). Which would be the best way to go with this?