I'd pay him in beer, but paypal is prolly more practical.
As for 6 buttons, I always suggest 7 (see attachment) it allows the classic capcom fighter layout, and also gives you a very good Neo Geo set up as well. the extra button can be used as Run in MK3/UMK3 and I use the ABC of the neo geo row for games like NBA Jam, NHL Open Ice, etc. again, just a suggestion.
if your going to put a spinner in there, I suggest the Turbo Twist 2 from groovy game gear, Im saving up for one myself.