A Bit of Advice Please

[AJax]

I'm looking to increase my 5RM and Power.
The area where i'm having trouble is the Squat.
Would I see better results by doing A or B?

A
3x warm up sets: 1x10@ 50%, 1x8@ 60%, 1x6@ 70-75%
Working weight: 5x5@ 85-90%

or

B
Warm up sets: 1x10@ 50%, 1x8@ 60%
Ramping: 1x6@ 70%, 1x6@ 80%, 1x6@ 90%, 1x6@ 70%

Adding 2.5Kg on the next workout after max reps for each set is reached.

This workout would be performed once a week (along with assistance exercises), my other leg workout having other exercises. I also do a seperate workout for deadlifts, with at least 48hrs between legs/deadlift workout.

[Bokers]

If you could post up your whole current routine we can look at more than just one leg session and maybe give you a bit more advice.

[AJax]

Ok, i'll try and make it as brief as possible

Monday: Deadlifts 4x6 (70-90%); T-Bar Rows 3x12, LatPullDowns 2x6, 2x15; WideGrip PullUps 3x6 weighted.
Tuesday: Shoulders (inc OHP 5x5)
Wednesday: LegPress 4x6 (~80-90%), 2x15; Squats (light) 2x15, Hamstring Curls 3x 8-12, 2xDropSet (8-12, 8), CalfRaises 3x15, Plyo Squats 3x8
Thursday: -
Friday: Bi&Tri& Abs
Saturday: Squats (AorB?), Front squats 3x 10-15, Romanian Deadlifts (straight-leg) 3x 10-12, Plyo Lunges 3x12, Calf raises 3x15
Sunday: Barbell Bench 5x5, Incline DBell Bench 3x 10-12, 1x15, FlatFlys, 3x12

I also do a Hard row after weights on Mon, Wed and Sat, with recovery rows (UT2) on Thurs and Sun, with a moderate 30min run on Tues.

I know the cardio is detrimental to strength gains, and will slow down progress, but they are necessary for indoor rowing.
Hope that helps