Hang tight for a little longer. Zastava PAP is coming out soon; $500 MSRP, sites already taking pre-orders for $350, great builder, and a little "work" inside the mag-well and it'll take 30-round mags just fine, looks like. Oh, and the muzzle needs to be threaded.
My suggestion is to have a beater AK that you can abuse the hell out of and really get to love the AK and one you take care of.
The Wasr series century is putting out is not half bad if you get one that has the sights and gas system are straight. I used to have a real pretty milled reciever arsenal that I sold for rent money in college (stupid stupid stupid)
I'm looking at a Bulgarian SSR-85C. It's not an underfolder but I hear that this AK is a good "middle of the road" AK. Classic Arms Inc. has them for $600.