Yes unprotected 21700 should work, and unprotected 18650 with adapter should work well.

In fact, using an unprotected 21700 will result in a bit higher average performance since unprotected 21700, or any unprotected battery, has a lower resistance than the protected batteries of the same grade.