L&F in JDK 7

Hello,

recently I stepped to JDK 7 for development and noticed some layout changes in the default L&F in my Swing applications. Especially the default margins in the containers have changed. This looks a bit ugly right now. Do you have tips or an url how to migrate to a better L&F and make JDK 6 and 7 more look alike.
I never forced a special L&F. Do you have a hint which is a good one. IMHO Nimbus does not to be an option.

Thanks
Thomas