I would seriously just do a clean install of leopard and keep what you got... the new MacBook's aren't an improvement enough to upgrade really.... Especially if your not doing anything too intense..
So buy some cool peripherals, dump some of the files you have been hording, and just install fresh.