Yeah it likely is enough to resensitize you, unless you went overboard with the bodyweight stuff which could nullify the "effort" by putting you in a fatigued state.
I wouldn't expect any strength loss in 2 weeks, especially if you stayed physically active during those 2 weeks. As you mentioned the lifts feel harder simply because you lost the feeling of heavy weights.
Layer would be good. I'm working on some new techniques but in the mean time layers are a good choice.
Regarding ring work. There is this one guy at the gym who is amazing on rings and bodyweight... seriously he does AMAZING stuff like holding a front lever then backrolling straight into a handstand and stuff like that. And he isn't a gymnast, just a guy who took up rings and bodyweight work 2 years ago. I've watched him train and he never does strength work and ring/bodyweight work on the same days, ever. We train at the same time and by approximation on some weeks he does 3 strength session and 2 ring/bodyweight sessions and on some other weeks he does the opposite. His strength work is 1 lift per day trained heavy.
I'm seen him put a lot of effort into squatting and weighted dips, some work on the bench press as well as technical work on the snatch.