You are reading my mind :-)

This is precisely what I plan to do next (this month if everything goes smoothly).