First, congratulations on stepping it up! Remember that there are good days on the river and then there are not so good days on the river, and they all add to your learning and ability. And the play park advice others have mentioned is a must...
I don't know about anyone else, and I'm certainly not the best at reading water, but I find that scouting as many different rapids/holes as you can helps a lot. Scout out stuff that's harder than would run right now, as close to river/boater eye level as you can, from both downstream and upstream, and visualize your line through the rapid. Holes are almost always hidden behind a dome or bulge in the water as seen from upstream at boater level, then dropping off precipitously behind the dome. The more familiarity you get by seeing a variety of holes from different perspectives helps you recognize where to go and not to go as you read and run more difficult water.
If you do get in a hole, try to work your way to one shoulder or the other with forward or back strokes, bracing in the foam pile.
and if you get windowshaded in the hole, usually just lifting (lowering?) your paddle to about chest height a lot of times will allow a paddle blade to catch the green water underneath and allow you to roll up in the hole for another attemp to work your way out--so don't immediately give up when you flip in the hole
also, the Nealy book is an amazing resource for understand rapids behavior and characteristics.
this is just my $.02, but I've been in my share of holes and it has worked pretty well for me. others may have different techniques
Idaho spings town run is a good, fairly continuous run that you might also try as a moderate step up