Custom permalink settings not working after site move

I used WP to rebuild an existing site by installing WP and changing the wp-config.php home and site urls to a test site domain. When I was ready to switch, I deleted that code from the wp-config.php file. Two problems with that were that the my images still had the test site domain source (probably a relative link solution) and the permalink structure is whacky. I tried updating the .htacess, deleting the permalink custom settings, and then adding them again, but they aren’t working. The posts show up just fine but the urls are /page/2/, /page/3/, and so on when they should be /year/postname. Any thing I can do about it? Site is http://johnorcuttnaturephoto.com and I’ve already referenced http://wordpress.org/support/topic/how-to-disable-permalink-definitively-?replies=21 and http://codex.wordpress.org/Changing_The_Site_URL#Edit_wp-config.php. Am I missing directions somewhere? Thanks!