You can also try to clone the flash memory to an SD-card.
With a decent card, you can get a speed improvement, and of course a LOT of space ...

Although the operation is not for faint-hearted, it shouldn't be very hard.
BTW, did you say "three weeks" ?