Given that you are not rushed, why not E-mail Progressive, explain your situation, and have them make a recommendation?
By most accounts, the 412 series are still an improvement over the OEM shocks, and are reasonably priced. The stock length (13") shocks are available in both standard and heavy duty versions. Perhaps progressive would make up a set equipped with an even stiffer spring rate than the h.d. model, if they determine that would better suit your individual requirements.
As for the forks - you won't regret installing aftermarket springs! I switched to Progressives about six years ago. The improvement is amazing! Unlike most folks, I retained the air system, although I modified it to include a manifold and gauge. Even though the Progressive springs stiffen the front end noticeably, I find adding just a few extra pounds of air makes highway cruising more enjoyable, providing the roads are smooth!
Cheers