I've just ordered the ELNAs from Parts Connexion too. Not sure how long they'll take to deliver, but I'm in no rush... I've just replaced the Caiman PSU with the Maplin Linear one that Stan recommended and am enjoying that for a while.

Ade