htaccess help – Password protect wp-admin and wp-login.php

So I had originally managed to password protect wp-admin and wp-login.php and all was good. Then I enabled “Day and Name” Permalink and all heck broke loose. Now, one would assume the best idea is to disable it and go back to the old page system, but I would really like to keep this setup if possible.
The issues are that the system will keep trying to redirect pages if I keep the Authentication in the folder (wp-admin). The file match for wp-login.php instead gives a “file not found” error, which means I can’t log out. If i have to go back to the page number system, I will, but if I don’t have to, that would be preferred. The reason for the password protection is to help stave off bots and attackers.

# BEGIN WordPress
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteBase /
RewriteCond %{REQUEST_URI} !^/(wp-admin|wp-admin/.*)$
RewriteCond %{EQUEST_FILENAME} !^/(wp-login\.php.*)$
#RewriteRule !^wp-login\.php$ - [OR,L]
RewriteRule ^index\.php$ - [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /index.php [L]
</IfModule>

# END WordPress

<FilesMatch "wp-login.php">
	RewriteEngine Off
	AuthType Basic
	AuthName "WP-Admin"
	AuthUserFile "authfile"
	require valid-user
</FilesMatch>