Sounds great to me, wish i had 3g to spend. I wouldn't hold my breath for the G5 PBs. Apple announced it would be a while. I would bump up to the dualie 2ghz and the 14in iBook. You'll get a big performance boost by moving to the 2ghz.
I think getting a dual 1.8 and 12" iBook is a good idea. Especially if you can sell (or trade in, at a place like Powermax or Smalldog) your 366 iBook. I'm waiting until WWDC to see if they have any low end G5's or new iMacs, or something. But we'll see.
You can always shop refurbished for an even better deal and use the savings on AppleCare.