I'd say go for the MAP tank. With your kind of Ecig I would try to grab a Mini MAP tank. Just be aware that these are very hard to get your hands on at the moment. Bruce from Cloudofvapors.com said he is probably gonna have a few go up on his website on Monday... that will be what is left from the 400 he is bringing at Vapefest. You could always try to post on the classifieds and swaps forums.
Mini Map tank with standard atty
Now all of this being said, the MAP tank isn't the only home made tank system made. Probably the most reliable at the moment but not the only one. An ECF member is currently making Storm Tanks, which have been getting good reviews. They can also be fitted with leds .....bling bling!!!
Storm tanks
Another thing you should look out for is for a new type of tank that should come out in the following weeks. The GP SSR Reservoir. It's from Goodprophets.com. They claim they will hold more and won't leak. So you should probably be lurking their website.
GoodProphets.com - Your view into the world of vaping...
And finally, (lol yeah everyone seems to be getting on the Tank bandwagon) another forum member that used to do his own tank mods and would sell them told me that he is working on a new tank system that will revolutionize how we use our ECigs and how we view tanks. He says they are going to be incredible. Now let's just wait and see, but he said we could expect to see some pop up soon. Now that being said, since it's a member I am not going to disclosure his name so he doesn't get flooded with PM's but you will probably hear about it when they come out.
As far as fluxos go, If you are going to try them out be sure to pick up the new Clearomizers E2 rev 6's that arrived a few days ago. they are supposed to be allot better than the old ones.
Just note that it is known that the clearomizers/fluxomizers are sometimes made of very cheap plastic that will crack at times. Also some flavors will make them disintegrate... (Apple, citrus, cinnamon an others will make the plastic become very fragile and if you only apply a slight pressure the plastic will crack)
This might have changed with the Rev 6 's , but I highly doubt it, since they only claim to have changed the tips, and the wicks.
I have heard they are also a PITA to fill. ( all of them)