Cravaack would have easier re-election bid under GOP plan