I have taken multiple different WFR courses, and I think WFA is a better choice for almost everyone. Some are more focused on buddy care, but just ask the instructor if you can do the exercise solo so it's more relevant to you.
My current kit is broken into two separate kits:
Kit 1- in my bino harness
A partial roll of krinkle gauze
Some basic meds like IBU, Arnica
Tourniquet
Kit 2- in my pack
Few different sizes of band-aides
A couple of Steri-strips
Krinkle gauze roll
Z-style blood-stopper bandage x 2
Chest seal bandage
Luco-tape
Coban wrap
Ace wrap x 2
Tourniquet
Basic meds, IBU, Benadryl, Pepto, Arnica, Cough drops
It all fits into an EXO stash pocket.
Sam-splint is in a pack, and I usually use my butt wipes for surface cleaning if needed.
I carry two separate kits in case something is bad enough that I have to deal with it immediately before I take my pack off and get to my primary kit, or if I want to pop some IBU, I don't have to take my pack off to get to my primary kit.
I usually instruct folks to practice applying TQs, Pressure Dressings, and Ace wraps one-handed, which also means with their support or weak hand.
MacGyverism is excellent, but when you or someone else is in a life-threatening situation, not having the tool immediately at hand costs time, which can be precious.