It does sound like it is becoming a prob, have you tried to settle him with Pat?shush? Maybe tht will help you out. As for the fingers I'd suggest you let him develop that if thats what he needs, its self soothing and he will drop the habbit as he grows older, Most kids will stop when they are ready. I wouldn't worry about the thum sucking untill he is much older, also you could try to introduce a lovie. Maybe that would help. At his age if he's waking for his Paci thats a sign of hard times to come, I'd nip that in the butt while you can.
Try the pat/shush though it may be just what he needs.