a and 2b. Some might argue that the progressive tense in 1a implies that you might be ready to take a break and massage your fingers whereas 2b suggests that you have tinkled away intermittently. Most people wouldn't be daft enough to make that distinction however and would accept either sentence.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.