if you love the portability of p&s and want to upgrade the image quality, go with panasonic GF2, or olympus e-pen or fugifilm x-100.

for DSLR, you can choose any entry level camera from canon or nikon. but make sure to buy 50mm 1.8f along with it.