Another option for you is to consider signing up for a drift diver specialty course. It is done over two dives, and will give you a good amount of knowledge about diving in a current. It also means you have an instructor in the water to focus only on you. Good opportunity to refresh some skills, and take a step forward in your training.