P.N.--Do yourself a big favor and do a search in this forum re: G series cameras and wa lenses. Unless YOU know the wa lens of your dreams will not vignette w/ a G-12 and your housing choice you won't be very happy w/ the results. Nemrod made invaluable (and one might say numerous) posts on this topic.
The problem has to do w/ where the lens sits when at it's widest (smallest focal length) setting, where the edges of the housing port are, how far the port glass sits from the lens and how far the wet wa lens sits from the port in it's adapter. (You really didn't think it was gonna be easy did you?

) So, you get things uw, zoom to your widest setting and later see that the corners in all those shots are dark and/or distorted. To avoid it, you bump up the zoom a notch or two. At which point you wonder why you have it on the camera since it won't be much wider than what you started with. When you walk in a store and put things together you still can't really tell even then because the wet lens will refract differently uw which can alter results w/ a lot of them.
I've owned a G-10, now shoot a G-11 & just added a G-12 and shoot them in Canon housings. Love 'em. But I don't do any wa except what the camera does on it's own (which is ok but...). Ah, but for macro? What a sweet deal. (I use a Sub-See setup but have used Dyron diopters and they are also solid.) IMO the latest G-series Canons are really superb for p&s macro. If wa is more your leaning grab an S-100 (or an S-95 if you can find any!). Significantly improved wa options due to smaller size, lens position, distance from port etc. It does ok on macro if you add some diopters but I think the G-series does better. So. Simple. Get both!
For your budget, you almost could--if you went w/ Canon housings. You asked about what things will come along for the ride on a p&s upgrade down the road and almost anything but the housings will. When you are looking at Fisheye or RecSee housings you aren't talking a low cost component. If you thought "This G-12 is all I will ever use" then sure, spend the bucks and get a great housing. Since you are already aware that down the road things change, a pricey housing that is now obsolete may not prove the best choice, budget wise.
I've been happy w/ Canon housings. They are more than adequate to the task (300+ dives on my G-10 setup). I added an S-95 I found on closeout and picked up a Canon housing and paid around $480. total. That's less than the additional $$ a better housing would have cost for my G-11. Not an ideal solution (the wrong camera will be on shore at the wrong time on occasion) but it adds a lot of possibilities and gives great backup peace of mind (the much smaller Canon WP-DC38 housing is easy to bring along). I have a Deeproof adapter and a Dyron on the S-95. The swingaway Deeproof is very handy and may avoid needing the Inon lens holder.
The other gear (strobes, arms etc.) will move along w/ any upgrades so get good arms (like UltraLite) and a good strobe (I use Sea & Seas, which are pretty bomb-proof strobes). Make sure you can expand to 2 strobes down the road (ie--your tray selection will let you add a 2d handle etc.) because eventually you will enjoy using two. Starting w/ one is a good way to go. I used a single strobe for 3 years and when I added a 2d it not only helped but it was also pretty easy to phase in to use. The YS-01 is a nice strobe. If you start w/ that you wouldn't have a problem adding a 2d one later or even upgrading for more output if needed. (And don't get me started on s-ttl. Shoot the camera and strobes on Manual. It's easy, gives much more controllable results.)
Well, this only added more opinion but it's what can help you decide--even if it's not to do what someone else did! Aside from housing choice I'd say pay real attention to the dome port & wa aspect of all this. It does no good to have any lens deliver a wider field if you can't use the whole field because the corners look like crap. If you can't view honest wa results (ie--uw pics) shot w/ a setup in question I'd question it. Hmmm, I just reread your list. A dome converter? This is not one that bungie cords over the housing setup is it? Alls I got to say about those is

. // ww
G-11 w/ +10 SubSee/ Anilao May, 2012: