A Patriot vs. A Rational Lover of One's own Country

Patriotism entails that you hold your country more favorable than any other. This irrational favoritism can be labeled as immoral, illogical and unproductive. It is immoral because you hold the potential to ignore your country's wrongdoings as well as the needs of humans in other places simply because of their geographical setting. It is illogical because all arguments based on whether or not your home country is deserving of this favoritism leads to opinions or judgments that are convoluted and never-ending. It is unproductive because it can be used by either side; you can say that you are not a patriot because you don't support the troops when they are ordered to do wrong and you do support them when they are ordered to do right, which can also come down to a never-ending argument loaded with opinions and personal judgments. What is then left of patriotism which makes it positive? Supporting only your chosen politicians, or only the core principles of the country, or the prosperity of the economic system, all of these are not reason enough to be a patriot, they are simply pieces of your country as a whole that you find preferable.
It is perhaps time then that we abandon the label "patriot" as a whole, and rather, what is needed is to create a term that embodies both an appreciation for the right and a condemnation of the wrong in one's chosen land. Am I not a patriot if I support my country's acceptance of all races, religions and creeds? Am I not a patriot if I condemn my country's war crimes and it's unequal treatment of certain civil rights movements? "Patriot" is not the right word for this. The best definition I can think of for this new term is, "One who values the positive ethical progress of the location in which one resides". This term would allow for both appreciation and protest. It would not make a mockery of political parties that disagree, and instead would value their dissent as an opportunity for rational discussion and a second look at how our common community, America, acts as a whole.

Is there a way for patriotism to be considered logical and ethical without removing the need for a special term?
Is there a way to consider yourself an impartial citizen of the world (an internationalist, a cosmopolitan, and a golden rule universalist) and still hold a willingness to support one's own country without becoming a hypocrite?