Punk all the fucking way! There are way too many bands to list... I'll name a few that haven't been mentioned yet:
Leftover Crack
Choking Victim
INDK
Morning Glory
Raised Fist
The (International) Noise Conspiracy
Youth Brigade
SNFU
Did anyone mention Offspring? They used to be good.
Ignite
At The Drive-In
Against Me!
NOFX (If you don't like these guys, you're probably not punk)
Vision
As for "rap"... mainstream rap is bullshit. Period. Bling-bling, blah blah blah. There is some good lesser-known stuff that isn't worth naming. Just throw out your rap CDs and buy punk.
If you want to know what else is good, checkout my list of albums:
http://octo.sytes.net:81/albums.php