If you apply for a multi-entry visa, then yes it will be good for land border re-entry (the correct term is a pre-arranged Visa. You can't just get a VOA without pre-arranging it with a travel agency).

I spent 4 days at Angkor and felt that was about right. So 7 days total for both places would work for me.