If you don't have proof (receipt) of AR-11 request, treat it as if you never filed it.
I'd update the address now and in few months after moving. Both times - AR-11. If you were moving in 3 days, I wouldn't bother, but few months is significant amount of time in my opinion.
On N-400 use the latest address after you move.
Make sure to update driver licenses / state IDs to match that address.