Soak your nails in warm water with dishwashing liquid added for 10 minutes.
Scrub the surface of the nails lightly with a terry washcloth.
Scrub the surface of the nails lightly with a soft nailbrush or toothbrush.
Dip a cotton swab in hydrogen peroxide and swab the nails to lighten any remaining stains.
Buff your nails lightly with a very fine-grit emery board or nail file.
Still Got Stains?
Wash your nails with a soft toothbrush and whitening toothpaste.
Cut a lemon in half. Loosen up the pulp. Stick your fingertips into the cut lemon halves and swirl them around for about 5 minutes. The lemon juice acts like a mild bleach on your nails.
Dilute 1 part bleach with 10 parts water and soak your nails in the solution. Gently scrub under the nails with the bleach solution to remove any remaining stains from under your nails.
Source: How to Remove Stains From Your Nails | eHow.com
Me, personally, I would just wait; but as you've said yourself, you're meticulous about your nails and clearly want to fix it.