Thank you very much for the input.
I went ahead and bought this for Cliffy.
I think he will appreciate this much better than what he's in.
Today, I removed his filter and gravel. Did a 100% change.
Added the required salt and conditioner.
I left the leaves for him to swim through, or lay on if he so desires. Left the heater, too. And the thermometer.
Unfortunately the only way to use the light is to have the filter on. So, Cliffy will have just window light that's across the room for this week until I receive my new tank and fully equip it for him.
I fed him his 2-3 twice a day pellets for dinner (new life spectrum, marine fish formula http://www.petco.com/assets/product_...916402083c.jpg
) after I put him in his new "scenery" and he ate like a pig, like normal. :P
Here's a picture:
I hope his soon to be tank and heater will help his moderate fin rot to go away and keep him happy as a clam. :D