i'm going to go against the grain here and say you'll get more out of the maf. but there are pro's and con's to each for you.
the stock maf is 55mm, stock t/b is 60mm. therefore if you swap the t/b out you're still drawing through that little 55mm maf. whereas if you swap the maf you're opening the intake up a bit. on the other hand if you swap the maf out now you'll have to get it recalibrated if you ever need to go to a larger injector.
my point is this: t/b won't IMHO do squat for your car, maybe a couple peak hp. maf should gain you more, but you may need to get it recal. down the road sometime AND they've been known to cause issues with CAI (which you have).
just some things to consider
-steve