Sounds like you have a plan. If you get to any gaskets or O-rings you can try coating them with silicone grease before putting them back. You can get a small tube of the stuff at any pool store.
Let us know how you make out.
Al