Help Finding New Soldering Torch

Hi, I'm new to this group and hope for some advice.

My problem is this: I ordered my first torch a few years ago. A Smith
propane/air set-up that they no longer sell. I also discovered
(recently) that the torch size I've been using is more suited to
annealing than fine soldering work (I can't believe I've been able to
create anything with the monster tip I've been using). Armed with this
knowledge, I embarked on a quest for my new torch. After having the
daylights scared out of me regarding propane, I opted for an acetylene/
oxygen combination. So, I ordered the oxy/acetylene/Smith Little torch
combination from Rio Grande. I received it today and was shocked at
how small the torch is. It seems just too small (much smaller than the
torch being used in the jewerly class I took recently).Disappointed
and concerned I just conducted some more research online and have read
that the Little Torch oxy/acetylene combination is probably the worst
set-up you can possibly have.
 With that in mind, I will be packing up this new torch and returning
it. But I still don't know what gas and torch to choose. I want the
most versatility that I can get. I'm not sure if I should get an oxy/
propane set up (and should I go for the Meco Midget in that case?) or
should I call up my plumber and have him work on fixing some pipes so
that I can work with Natural gas (though I have no idea how the oxygen
tank would come into the picture). I just want a versatile set up that
has a mid-size torch and is safe (my cat does hang out in the
basement, which is where I do my jewelery work).