Sounds like a good fix, I’ve had a the same problem with air pockets. Where do you plan on, or did you, buy the check valves?