Sounds like you need a share in a Super Cub or similar.
You probably already know what type of flying you're going to be doing and it does rather sound as if you need two types; I'd go with option 2.
How about trying a little aerobatics after your tailwheel course? You may find a little aerobatic biplane (on a permit) just the thing.